Skip to content

Commit 640bfe5

Browse files
author
Olexii Korshenko
committed
Merge branch 'mainline-develop' into checkout
2 parents 6ed9ab3 + 03e6a16 commit 640bfe5

File tree

147 files changed

+4633
-1311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+4633
-1311
lines changed

‎app/code/Magento/Checkout/view/frontend/web/template/shipping.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<li id="opc-shipping" data-bind="fadeVisible: visible()">
7+
<li id="opc-shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()">
88
<div class="step-title" data-bind="text: $t('Shipping Address')" data-role="title"></div>
99
<div id="checkout-step-shipping"
1010
class="step-content"
@@ -48,7 +48,10 @@
4848

4949

5050
<!--Shipping method template-->
51-
<li id="opc-shipping_method" data-bind="fadeVisible: visible(), blockLoader: isLoading" role="presentation">
51+
<li id="opc-shipping_method"
52+
class="checkout-shipping-method"
53+
data-bind="fadeVisible: visible(), blockLoader: isLoading"
54+
role="presentation">
5255
<div class="checkout-shipping-method">
5356
<div class="step-title" data-bind="text: $t('Shipping Methods')" data-role="title"></div>
5457
<!-- ko foreach: getRegion('before-shipping-method-form') -->

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323

2424
@menu-item__color: @color-gray65-lighten;
2525
@menu-item__font-size: 1rem;
26-
@menu-item__active__background-color: @color-brownie-almost;
26+
@menu-item__hover__background-color: @color-brownie-almost;
27+
@menu-item__active__background-color: darken(@menu-item__hover__background-color, 3%);
2728
@menu-item__active__color: @color-ivory;
2829
@menu-item-icon__height: 2.2rem;
2930

@@ -47,6 +48,37 @@
4748
@submenu-heading-group__indent-bottom: 3.8rem;
4849
@submenu-action-close__indent-right: 2.8rem;
4950

51+
//
52+
// Utilities
53+
// ---------------------------------------------
54+
55+
.admin__menu-link() {
56+
color: @menu-item__color;
57+
display: block;
58+
font-size: @menu-item__font-size;
59+
letter-spacing: .025em;
60+
min-height: 6.2rem;
61+
padding: 1.2rem .5rem .5rem;
62+
position: relative;
63+
text-align: center;
64+
text-decoration: none;
65+
text-transform: uppercase;
66+
transition: background-color .1s linear;
67+
word-wrap: break-word;
68+
z-index: @menu__z-index;
69+
&:focus {
70+
box-shadow: none;
71+
}
72+
&:before {
73+
&:extend(.abs-icon all);
74+
content: @icon-menu-item__content;
75+
display: block;
76+
font-size: 2.2rem;
77+
height: @menu-item-icon__height;
78+
margin-bottom: .3rem;
79+
}
80+
}
81+
5082
//
5183
// Menu wrapper
5284
// ---------------------------------------------
@@ -160,37 +192,22 @@
160192
&._active,
161193
&:hover {
162194
> a {
163-
background-color: @menu-item__active__background-color;
164195
color: @menu-item__active__color;
165196
}
166197
}
167-
> a {
168-
color: @menu-item__color;
169-
display: block;
170-
font-size: @menu-item__font-size;
171-
letter-spacing: .025em;
172-
min-height: 6.2rem;
173-
padding: 1.2rem .5rem .5rem;
174-
position: relative;
175-
text-align: center;
176-
text-decoration: none;
177-
text-transform: uppercase;
178-
transition: background-color .1s linear;
179-
word-wrap: break-word;
180-
z-index: @menu__z-index;
181-
&:focus {
182-
box-shadow: none;
198+
&._active {
199+
> a {
200+
background-color: @menu-item__hover__background-color;
183201
}
184-
&:before {
185-
&:extend(.abs-icon all);
186-
content: @icon-menu-item__content;
187-
display: block;
188-
font-family: @icons-admin__font-name;
189-
font-size: 2.2rem;
190-
height: @menu-item-icon__height;
191-
margin-bottom: .3rem;
202+
}
203+
&:hover {
204+
> a {
205+
background-color: @menu-item__active__background-color;
192206
}
193207
}
208+
> a {
209+
.admin__menu-link();
210+
}
194211
}
195212

196213
//

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_notifications.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
}
6565

6666
.notifications-action {
67+
color: @notifications-action__color;
6768
height: @page-header-action__height;
6869
padding: @notifications-action__padding-top @notifications-action__padding-side @notifications-action__padding-bottom;
6970
&:after {

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_search.less

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
@search-global-input__active__padding-right: @search-global-icon__height + 2rem;
2626
@search-global-input__active__width: 25rem;
2727

28+
@search-global-label-icon__color: @text__color;
2829
@search-global-icon__height: 2rem;
2930
@search-global-icon__width: 2.2rem;
3031

@@ -128,6 +129,7 @@
128129
}
129130
&:before {
130131
&:extend(.abs-icon all);
132+
color: @search-global-label-icon__color;
131133
content: @icon-search__content;
132134
font-size: @search-global-icon__height;
133135
}

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/actions-group/_user.less

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
@user-account-menu__hover__background-color: @action__hover__background-color;
2222
@user-account-menu__active__background-color: darken(@color-blue-clear-sky, 5%);
2323

24+
@user-account-action__color: @text__color;
25+
@user-account-action__hover__color: @text__color;
26+
2427
//
2528

2629
.admin-user {
@@ -40,7 +43,7 @@
4043
.admin__action-dropdown {
4144
.action-toggle-triangle(
4245
@_dropdown__padding-right: @user-account__padding-right;
43-
@_triangle__color: @action-dropdown__color;
46+
@_triangle__color: @user-account-action__color;
4447
@_triangle__hover__color: @action-dropdown__hover__color;
4548
@_triangle__right: 1.3rem;
4649
);
@@ -52,13 +55,19 @@
5255
@_icon-user__size: 2rem;
5356

5457
&:extend(.abs-icon all);
58+
color: @user-account-action__color;
5559
content: @icon-account__content;
5660
font-size: @_icon-user__size;
5761
left: 1.1rem;
5862
margin-top: -(@_icon-user__size / 2) - .1rem;
5963
position: absolute;
6064
top: 50%;
6165
}
66+
&:hover {
67+
&:before {
68+
color: @user-account-action__hover__color;
69+
}
70+
}
6271
}
6372
// User account menu
6473
.admin__action-dropdown-menu {

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@
1414

1515
@import 'actions-bar/_store-switcher.less';
1616

17-
//
18-
// Variables
19-
// ---------------------------------------------
20-
21-
@page-main-actions__background-color: @color-white-fog;
22-
@page-main-actions__border-color: @color-gray89;
23-
@page-main-actions__padding: @content__indent / 2;
24-
25-
//
26-
2717
.page-main-actions:not(._hidden),
2818
.page-actions._fixed {
2919
&:extend(.abs-clearfix all);

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848

4949
@data-grid-row-parent-marker__size: 1rem;
5050

51-
@data-grid-td__dragging__opacity: 95%;
52-
@data-grid-dragging-copy__border-color: @color-blue-pure;
53-
@data-grid-dragging-copy__border: 1px solid @data-grid-dragging-copy__border-color;
54-
5551
//
5652

5753
.admin__data-grid-outer-wrap {

‎setup/view/styles/lib/_messages.less renamed to ‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/_messages.less

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99

1010
@icons-admin__font-name: @icons__font-family;
1111

12-
@icon-info__content: @icon-notice-messages__content;
13-
@icon-warning__content: @icon-warning-messages__content;
14-
@icon-check-mage__content: @icon-success-messages__content;
15-
@icon-error__content: @icon-error-messages__content;
16-
1712
.message {
1813
margin-bottom: 3rem;
1914
}
15+
16+
.message-icon-top {
17+
&:before {
18+
margin-top: 0;
19+
top: 1.8rem;
20+
}
21+
}

‎setup/view/styles/components/_navigation-bar.less renamed to ‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/_navigation-bar.less

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
@nav-bar-bullet-wrap__border-top-color: @color-gray75;
2121

2222
@nav-bar-dot__size: 2.2rem;
23+
@nav-bar-dot__border-width: .1rem;
2324
@nav-bar-items__indent-bottom: 1.7rem;
2425
@nav-bar-item__color: @color-gray65;
2526

@@ -93,7 +94,7 @@
9394
border-bottom: 1px solid @nav-bar-bullet-wrap__border-bottom-color;
9495
border-top: 1px solid @nav-bar-bullet-wrap__border-top-color;
9596
content: '';
96-
height: .8rem;
97+
height: 1rem;
9798
left: @nav-bar-step__width / 2;
9899
position: absolute;
99100
right: @nav-bar-step__width / 2;
@@ -198,15 +199,15 @@
198199
color: @color-white;
199200
content: counter(i);
200201
counter-increment: i;
201-
height: @nav-bar-point__size;
202+
height: @nav-bar-point__size + @nav-bar-point__border-width * 2;
202203
left: 50%;
203204
line-height: .6;
204205
margin-left: -@nav-bar-point__size - .1;
205206
position: absolute;
206207
right: auto;
207208
text-align: center;
208209
top: @nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05;
209-
width: @nav-bar-point__size;
210+
width: @nav-bar-point__size + @nav-bar-point__border-width * 2;
210211
}
211212

212213
// Visited step link bullet wrap
@@ -217,13 +218,13 @@
217218
border-radius: 100%;
218219
border-top-color: @nav-bar-bullet-wrap__border-top-color;
219220
content: '';
220-
height: @nav-bar-dot__size - .1;
221+
height: @nav-bar-dot__size + @nav-bar-dot__border-width * 2 - @nav-bar-dot__border-width;
221222
left: 50%;
222223
line-height: 1;
223-
margin-left: -(@nav-bar-dot__size / 2) - .1;
224+
margin-left: -(@nav-bar-dot__size / 2) - @nav-bar-dot__border-width;
224225
position: absolute;
225226
top: 0;
226-
width: @nav-bar-dot__size - .1;
227+
width: @nav-bar-dot__size + @nav-bar-dot__border-width * 2 - @nav-bar-dot__border-width;
227228
}
228229
}
229230
}

‎setup/view/styles/components/_progress-bars.less renamed to ‎app/design/adminhtml/Magento/backend/web/app/setup/styles/less/components/_progress-bars.less

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@
7474

7575
// Call animation for the active one
7676

77-
.progress-bar.active {
78-
.animation(progress-bar-stripes 2s linear infinite);
77+
.progress-bar {
78+
&.active {
79+
.animation(progress-bar-stripes 2s linear infinite);
80+
}
81+
}
82+
83+
.progress-bar-text-description {
84+
margin-bottom: 1.6rem;
85+
}
86+
87+
.progress-bar-text-progress {
88+
text-align: right;
7989
}

0 commit comments

Comments
 (0)