Skip to content

Commit 46dce62

Browse files
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #13987: Backport of PR-13750 for Magento 2.1: Less clean up (by @Karlasa) - #13980: Backport of PR-13777. Mobile 'Payments methods' step looks bad on mobile (by @Frodigo) Fixed GitHub Issues: - #13315: Mobile "Payment Methods" step looks bad on mobile (reported by @ihor-sviziev) has been fixed in #13980 by @Frodigo in 2.1-develop branch Related commits: 1. 17a707a
2 parents 0391400 + cbf4a67 commit 46dce62

File tree

5 files changed

+21
-27
lines changed

5 files changed

+21
-27
lines changed

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@
106106
.lib-dropdown(
107107
@_toggle-selector: ~'.action.showcart',
108108
@_options-selector: ~'.block-minicart',
109+
@_dropdown-list-width: 320px,
110+
@_dropdown-list-position-right: 0px,
111+
@_dropdown-list-pointer-position: right,
112+
@_dropdown-list-pointer-position-left-right: 26px,
109113
@_dropdown-toggle-icon-content: @icon-cart,
110114
@_dropdown-toggle-active-icon-content: @icon-cart,
111115
@_dropdown-list-item-padding: false,
@@ -121,22 +125,10 @@
121125

122126
.block-minicart {
123127
.lib-css(padding, 25px @minicart__padding-horizontal);
124-
right: 0;
125-
width: 320px;
126128

127129
.block-title {
128130
display: none;
129131
}
130-
131-
&:after {
132-
left: auto;
133-
right: 25px;
134-
}
135-
136-
&:before {
137-
left: auto;
138-
right: 26px;
139-
}
140132
}
141133

142134
.product {

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@
162162
.lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding));
163163
}
164164

165+
.step-title {
166+
.lib-css(padding-left, @checkout-payment-method-title-mobile__padding);
167+
.lib-css(padding-right, @checkout-payment-method-title-mobile__padding)
168+
}
169+
165170
.payment-method-title {
166171
.lib-css(padding, @checkout-payment-method-title-mobile__padding)
167172
}

app/design/frontend/Magento/blank/web/css/source/_navigation.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
.switcher {
9494
border-top: 1px solid @color-gray82;
9595
font-size: 1.6rem;
96-
font-weight: 700;
96+
font-weight: @font-weight__bold;
9797
margin: 0;
9898
padding: .8rem 3.5rem .8rem 2rem;
9999

@@ -147,7 +147,7 @@
147147

148148
&.greet.welcome {
149149
border-top: 1px solid @color-gray82;
150-
font-weight: 700;
150+
font-weight: @font-weight__bold;
151151
padding: .8rem @indent__base;
152152
}
153153

@@ -161,7 +161,7 @@
161161
.lib-css(color, @navigation-level0-item__color);
162162
.lib-css(text-decoration, @navigation-level0-item__text-decoration);
163163
display: block;
164-
font-weight: 700;
164+
font-weight: @font-weight__bold;
165165
padding: .8rem @indent__base;
166166
}
167167

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@
109109
.lib-dropdown(
110110
@_toggle-selector: ~'.action.showcart',
111111
@_options-selector: ~'.block-minicart',
112+
@_dropdown-list-width: 320px,
113+
@_dropdown-list-position-right: 0px,
114+
@_dropdown-list-pointer-position: right,
115+
@_dropdown-list-pointer-position-left-right: 26px,
112116
@_dropdown-toggle-icon-content: @icon-cart,
113117
@_dropdown-toggle-active-icon-content: @icon-cart,
114118
@_dropdown-list-item-padding: false,
@@ -124,22 +128,10 @@
124128

125129
.block-minicart {
126130
.lib-css(padding, 25px @minicart__padding-horizontal);
127-
right: 0;
128-
width: 320px;
129131

130132
.block-title {
131133
display: none;
132134
}
133-
134-
&:after {
135-
left: auto;
136-
right: 25px;
137-
}
138-
139-
&:before {
140-
left: auto;
141-
right: 26px;
142-
}
143135
}
144136
.product {
145137
.actions {

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@
162162
.lib-css(margin, 0 -(@checkout-payment-method-title-mobile__padding));
163163
}
164164

165+
.step-title {
166+
.lib-css(padding-left, @checkout-payment-method-title-mobile__padding);
167+
.lib-css(padding-right, @checkout-payment-method-title-mobile__padding)
168+
}
169+
165170
.payment-method-title {
166171
.lib-css(padding, @checkout-payment-method-title-mobile__padding)
167172
}

0 commit comments

Comments
 (0)