Skip to content

Commit fbe5f93

Browse files
author
Natalia Momotenko
committed
MAGETWO-45177: Improve indents in the less files according less code standards
- Merge remote-tracking branch 'origin/MAGETWO-45177' into PR-1 - Conflicts: - app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less - app/design/adminhtml/Magento/backend/web/app/setup/styles/less/pages/_readiness-check.less - app/design/adminhtml/Magento/backend/web/css/source/_structure.less - app/design/frontend/Magento/blank/Magento_GroupedProduct/web/css/source/_module.less - app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less - app/design/frontend/Magento/luma/Magento_GiftRegistry/web/css/source/_module.less - app/design/frontend/Magento/luma/Magento_GroupedProduct/web/css/source/_module.less
2 parents 34d140b + 8b12310 commit fbe5f93

File tree

246 files changed

+4145
-82
lines changed

Some content is hidden

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

246 files changed

+4145
-82
lines changed

app/design/adminhtml/Magento/backend/Magento_AdminNotification/web/css/source/_module.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
.message-system-inner {
1818
&:extend(.abs-clearfix all);
1919
background: @message-system__background-color;
20+
2021
.message-system-list {
2122
float: left;
2223
width: 75%;
@@ -32,13 +33,16 @@
3233
.message-system-short {
3334
overflow: hidden;
3435
text-align: right;
36+
3537
.message-system-short-label {
3638
display: inline-block;
3739
padding: @message-system-short-message__padding-vertical .3rem @message-system-short-message__padding-vertical 1rem;
3840
}
41+
3942
.message {
4043
display: inline-block;
4144
padding: @message-system-short-message__padding-vertical 2rem @message-system-short-message__padding-vertical 3.3rem;
45+
4246
&:before {
4347
left: .3rem;
4448
}

app/design/adminhtml/Magento/backend/Magento_AdvancedCheckout/web/css/source/_module.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
.accordion & {
88
margin: 0 0 @indent__base;
99
}
10+
1011
.add-sku-csv {
1112
.admin__field-label {
1213
&:before {

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module-old.less

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
background-color: #fff;
1818
border: 1px solid #ada89e;
1919
border-radius: 2px;
20+
2021
&:after {
2122
position: absolute;
2223
top: 3px;
@@ -33,13 +34,15 @@
3334
font-size: 18px;
3435
color: #b2b2b2;
3536
}
37+
3638
input[type="search"],
3739
input.search {
3840
width: 100%;
3941
border: none;
4042
background: none;
4143
padding-right: 30px;
4244
}
45+
4346
&.category-select {
4447
input[type="search"],
4548
input.search {
@@ -56,6 +59,7 @@
5659
background-color: transparent;
5760
border: none;
5861
border-radius: 0;
62+
5963
&:after {
6064
display: none;
6165
}
@@ -71,21 +75,26 @@
7175
background: #fff;
7276
box-shadow: 0 2px 4px rgba(0, 0, 0, .2);
7377
z-index: 990;
78+
7479
ul {
7580
margin: 0;
7681
padding: 0;
7782
list-style: none;
7883
}
84+
7985
li {
8086
border-bottom: 1px solid #e5e5e5;
8187
padding: 0;
88+
8289
a {
8390
display: block;
91+
8492
&.ui-state-focus {
8593
background: #f5f5f5;
8694
}
8795
}
8896
}
97+
8998
li a,
9099
.jstree li a:hover,
91100
.jstree .jstree-hovered,
@@ -95,18 +104,22 @@
95104
color: #333;
96105
height: inherit !important;
97106
}
107+
98108
.jstree {
99109
li a:hover,
100110
.jstree-hovered,
101111
.jstree-clicked {
102112
border: none;
103113
}
114+
104115
li {
105116
border-bottom: 0;
117+
106118
a {
107119
display: inline-block;
108120
}
109121
}
122+
110123
.mage-suggest-selected > a {
111124
color: #000;
112125
background: #F1FFEB;
@@ -158,35 +171,42 @@
158171
font-size: 12px;
159172
padding: 5px 4px;
160173
filter: none;
174+
161175
span {
162176
display: inline;
163177
}
178+
164179
&:before {
165180
display: inline-block;
166181
float: right;
167182
margin-left: 4px;
168183
font-size: 13px;
169184
color: #b2b0ad;
170185
}
186+
171187
&:hover:before {
172188
color: #7e7e7e;
173189
}
174190
}
191+
175192
.dropdown-menu {
176193
margin: 1px 0 0;
177194
left: 0;
178195
right: auto;
179196
width: 245px;
180197
z-index: 4;
181198
}
199+
182200
.mage-suggest {
183201
border: none;
184202
border-radius: 3px 3px 0 0;
203+
185204
&:after {
186205
top: 10px;
187206
right: 8px;
188207
}
189208
}
209+
190210
.mage-suggest-inner {
191211
.title {
192212
margin: 0;
@@ -196,6 +216,7 @@
196216
font-size: 12px;
197217
border-bottom: 1px solid #e5e5e5;
198218
}
219+
199220
> input[type="search"],
200221
> input.search {
201222
position: relative;
@@ -205,11 +226,13 @@
205226
width: 236px;
206227
z-index: 1;
207228
}
229+
208230
> input.ui-autocomplete-loading,
209231
> input.mage-suggest-state-loading {
210232
background: #fff url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
211233
}
212234
}
235+
213236
.mage-suggest-dropdown {
214237
margin-top: 0;
215238
border-top: 0;
@@ -218,6 +241,7 @@
218241
overflow: auto;
219242
width: 100%;
220243
float: left;
244+
221245
ul {
222246
margin: 0;
223247
padding: 0;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
color: @footer__color;
2727
margin-top: auto;
2828
padding: 2.6rem 2rem 6rem 3rem;
29+
2930
a {
3031
.lib-link(
3132
@_link-color: @footer-link__color,
@@ -38,6 +39,7 @@
3839
@_link-text-decoration-active: false
3940
);
4041
}
42+
4143
.admin__control-select {
4244
max-width: 52rem;
4345
width: 100%;
@@ -46,6 +48,7 @@
4648

4749
.magento-version {
4850
margin-bottom: .5rem;
51+
4952
strong {
5053
color: @footer-version__color;
5154
}
@@ -56,16 +59,19 @@
5659
margin-bottom: -.2rem;
5760
text-align: left;
5861
position: relative;
62+
5963
.link-copyright {
6064
display: inline-block;
6165
margin-right: .5rem;
6266
text-decoration: none;
6367
vertical-align: top;
68+
6469
&:hover {
6570
&:before {
6671
color: lighten(@color-light-phoenix, 10%);
6772
}
6873
}
74+
6975
&:before {
7076
&:extend(.abs-icon all);
7177
.transition(color);
@@ -76,6 +82,7 @@
7682
position: relative;
7783
top: -.2rem;
7884
}
85+
7986
&:active {
8087
&:before {
8188
.scale();

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
&:first-child {
192192
> a {
193193
position: relative;
194+
194195
// Separator between logo and menu
195196
&:after {
196197
&:extend(.abs-menu-separator);
@@ -205,6 +206,7 @@
205206
}
206207
}
207208
}
209+
208210
// Hover & active state for menu level 0 item
209211
&._active,
210212
&:hover {
@@ -317,6 +319,7 @@
317319

318320
.parent {
319321
margin-bottom: 4.5rem;
322+
320323
// Section title
321324
> a, // ToDo UI: Should be deleted after template changes a -> strong.submenu-group-title
322325
.submenu-group-title {

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@
3636
float: right;
3737
line-height: 1;
3838
position: relative;
39+
3940
&.active {
4041
z-index: @notifications-action-menu__z-index; // Should be over global search when active
42+
4143
.notifications-action {
4244
border-color: @action-dropdown__active__border-color;
4345
box-shadow: @component__box-shadow__base;
46+
4447
&:after {
4548
border: none;
4649
background-color: @action-dropdown__background-color;
@@ -56,6 +59,7 @@
5659
}
5760
}
5861
}
62+
5963
// Notifications dropdown
6064
.admin__action-dropdown-menu {
6165
padding: 1rem 0 0;
@@ -67,21 +71,25 @@
6771
color: @notifications-action__color;
6872
height: @page-header-action__height;
6973
padding: @notifications-action__padding-top @notifications-action__padding-side @notifications-action__padding-bottom;
74+
7075
&:after {
7176
display: none;
7277
}
78+
7379
&:before {
7480
&:extend(.abs-icon all);
7581
content: @icon-notification-02__content;
7682
font-size: @notifications-action-icon__size;
7783
margin-right: 0;
7884
}
85+
7986
&:active {
8087
&:before {
8188
position: relative;
8289
top: 1px;
8390
}
8491
}
92+
8593
.notifications-counter {
8694
background-color: @notifications-counter__background-color;
8795
border-radius: 1em;
@@ -103,24 +111,30 @@
103111
padding: @notifications-entry__padding-top @notifications-action__padding-side .8rem;
104112
position: relative;
105113
transition: @smooth__background-color;
114+
106115
&:hover {
107116
background-color: @notifications-entry__hover__background-color;
108117
}
118+
109119
&.notifications-entry-last {
110120
margin: 0 @notifications-action__padding-side;
111121
padding: .3rem 0 1.3rem;
112122
text-align: center;
123+
113124
&:hover {
114125
background-color: transparent;
115126
}
116127
}
128+
117129
+ .notifications-entry-last {
118130
border-top: 1px solid @color-light-gray;
119131
padding-bottom: .6rem;
120132
}
133+
121134
// Case with cutted message description
122135
._cutted {
123136
cursor: pointer;
137+
124138
.notifications-entry-description-start {
125139
&:after {
126140
content: '...';
@@ -146,6 +160,7 @@
146160

147161
.notifications-entry-description-end {
148162
display: none;
163+
149164
&._show {
150165
display: inline;
151166
}
@@ -163,17 +178,20 @@
163178
position: absolute;
164179
right: 0;
165180
top: .6rem;
181+
166182
&:before {
167183
&:extend(.abs-icon all);
168184
color: @notifications-close__color;
169185
content: @icon-remove-small__content;
170186
.transition(color);
171187
}
188+
172189
&:hover {
173190
&:before {
174191
color: darken(@notifications-close__color, 10%);
175192
}
176193
}
194+
177195
&:active {
178196
transform: scale(.95);
179197
}

0 commit comments

Comments
 (0)