Skip to content

Commit bbe3554

Browse files
committed
MAGETWO-35616: Frontend themes variables inheritance update & documentation update
- Arranging theme files call - Correcting theme variables naming and variables positions - Deleting extra variables
1 parent 528d001 commit bbe3554

File tree

25 files changed

+55
-67
lines changed

25 files changed

+55
-67
lines changed

app/design/adminhtml/Magento/backend/web/css/styles.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// ---------------------------------------------
1313

1414
@import 'source/lib/_lib.less'; // Global lib
15+
@import (reference) 'source/_extends.less';
1516
@import 'source/_theme.less'; // Theme variables overrides
1617
@import 'source/_sources.less'; // Theme
1718

app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311

312312
.prices-tier {
313313
&:extend(.abs-reset-list all);
314-
.css(background, @sidebar-background);
314+
.css(background, @sidebar__background-color);
315315
padding: @indent__s (.75 * @indent__base);
316316
margin: @indent__s 0;
317317
.price-tier_price {

app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
@product-name-text-decoration: none;
77
@product-name-text-decoration-hover: @link__hover__text-decoration;
88

9-
109
//
1110
// Common
1211
//--------------------------------------
@@ -29,7 +28,7 @@
2928
}
3029
}
3130

32-
// Product Lists
31+
// Product Lists
3332
.products {
3433
margin: @indent__l 0;
3534
}
@@ -51,7 +50,7 @@
5150
display: block;
5251
margin: @indent__xs 0;
5352
word-break: break-all;
54-
// Non standard for webkit
53+
// Non standard for webkit
5554
word-break: break-word;
5655
-webkit-hyphens: auto;
5756
-moz-hyphens: auto;
@@ -248,8 +247,8 @@
248247
}
249248

250249
//
251-
// Mobile
252-
//--------------------------------------
250+
// Mobile
251+
// ---------------------------------------------
253252

254253
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
255254
.products-list .product {
@@ -302,8 +301,8 @@
302301
}
303302

304303
//
305-
// Desktop
306-
//--------------------------------------
304+
// Desktop
305+
// ---------------------------------------------
307306

308307
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
309308
.page-products .products-grid .product-item { width: 100%/3 }

app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_toolbar.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
}
9595

9696
//
97-
// Mobile
98-
//--------------------------------------
97+
// Mobile
98+
// ---------------------------------------------
9999

100100
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
101101
.page-products .columns {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
.opc-block-progress:extend(.abs-add-box-sizing all) {
285285
margin-bottom: @indent__l;
286286
> .title {
287-
.css(background, @sidebar-background);
287+
.css(background, @sidebar__background-color);
288288
.heading(h3);
289289
margin: 0;
290290
padding: 15px 15px @indent__base;
@@ -293,7 +293,7 @@
293293
}
294294
}
295295
> .content {
296-
.css(background, @sidebar-background);
296+
.css(background, @sidebar__background-color);
297297
padding: 0 15px @indent__xs;
298298
.item-content.complete {
299299
margin: 0 0 15px;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Summary block
1717
&-summary {
1818
&:extend(.abs-add-box-sizing all);
19-
.css(background, @sidebar-background);
19+
.css(background, @sidebar__background-color);
2020
margin-bottom: @indent__m;
2121
padding: 1px 15px @indent__m;
2222
> .title {

app/design/frontend/Magento/blank/Magento_Cms/web/css/source/_widgets.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@widgets-indent-bottom: @indent__base;
6+
@widgets-indent__bottom: @indent__base;
77

88
//
99
// Common
@@ -14,7 +14,7 @@
1414
.block-static-block,
1515
.block-cms-link {
1616
&.widget {
17-
.css(margin-bottom, @widgets-indent-bottom);
17+
.css(margin-bottom, @widgets-indent__bottom);
1818
.links & {
1919
margin-bottom: 0;
2020
}

app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
&:extend(.abs-reset-image-wrapper all);
3737
}
3838
.options-items {
39-
.css(background, @sidebar-background);
39+
.css(background, @sidebar__background-color);
4040
display: block;
4141
margin: @indent__base 0 0;
4242
padding: @indent__base;

app/design/frontend/Magento/blank/Magento_Theme/web/css/source/_module.less

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434

3535
@h1__margin-bottom__desktop: @indent__xl;
3636

37+
//
38+
// Footer
39+
// ---------------------------------------------
40+
41+
@footer__background-color: false;
42+
3743
//
3844
// Common
3945
//--------------------------------------
@@ -136,8 +142,6 @@ body {
136142
// Footer
137143
//--------------------------------------
138144

139-
@footer__background-color: false;
140-
141145
.page-footer {
142146
margin-top: auto;
143147
.css(background-color, @footer__background-color);

app/design/frontend/Magento/blank/Magento_Theme/web/css/source/module/_collapsible_navigation.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@collapsible-nav-background: @sidebar-background;
6+
@collapsible-nav-background: @sidebar__background-color;
77
@collapsible-nav-item-hover: @color-gray91;
88
@collapsible-nav-color: false;
99
@collapsible-nav-current-color: false;

0 commit comments

Comments
 (0)