Skip to content

Commit 1cd6c17

Browse files
author
Natalia Momotenko
committed
MAGETWO-31855: UI improvements
- Rewrite responsive mixins, they should use only one mixin
1 parent bf50ea9 commit 1cd6c17

File tree

77 files changed

+565
-1121
lines changed

Some content is hidden

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

77 files changed

+565
-1121
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/**
2-
* @category design
32
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
43
*/
54

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Common
77
//--------------------------------------
88

9-
.responsive-common() {
9+
& when (@media-common = true) {
1010

1111
.bundle-actions {
1212
&:extend(.abs-box-tocart all);
@@ -103,7 +103,7 @@
103103
//
104104
// Desktop
105105
//--------------------------------------
106-
.responsive-min-l(@break) when (@break = @screen-m) {
106+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
107107
.bundle-options-container {
108108
.legend.title {
109109
&:extend(.abs-reset-left-margin all);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// Common
1111
//--------------------------------------
1212

13-
.responsive-common() {
13+
& when (@media-common = true) {
1414

1515
.product-name() {
1616
font-weight: @font-weight-base;
@@ -250,7 +250,7 @@
250250
// Mobile
251251
//--------------------------------------
252252

253-
.responsive-max-m (@break) when (@break = @screen-s) {
253+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-s) {
254254
.products-list .product {
255255
&-item {
256256
table-layout: fixed;
@@ -262,7 +262,7 @@
262262
}
263263
}
264264

265-
.responsive-min-m(@break) when (@break = @screen-s) {
265+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-s) {
266266
.product {
267267
&-item {
268268
.products-grid & {
@@ -304,12 +304,12 @@
304304
// Desktop
305305
//--------------------------------------
306306

307-
.responsive-min-l(@break) when (@break = @screen-m) {
307+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
308308
.page-products .products-grid .product-item { width: 100%/3 }
309309
.page-products.page-layout-1column .products-grid .product-item { width: 100%/4 }
310310
.page-products.page-layout-3columns .products-grid .product-item { width: 100%/2 }
311311
}
312-
.responsive-min-l(@break) when (@break = @screen-l) {
312+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-l) {
313313
.products-grid .product-item { width: 100%/5 }
314314
.page-layout-1column .products-grid .product-item { width: 100%/6 }
315315
.page-layout-3columns .products-grid .product-item { width: 100%/4 }

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
// Common
3737
//--------------------------------------
3838

39-
.responsive-common() {
39+
& when (@media-common = true) {
4040

4141
//
4242
// Category view
@@ -389,7 +389,7 @@
389389
//
390390
// Mobile
391391
//--------------------------------------
392-
.responsive-max-m(@break) when (@break = @screen-m) {
392+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
393393
.catalog-product-view {
394394
.column.main {
395395
.vendor-prefix-display(flex);
@@ -417,7 +417,7 @@
417417
//
418418
// Desktop
419419
//--------------------------------------
420-
.responsive-min-l(@break) when (@break = @screen-m) {
420+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
421421
.product-info-main,
422422
.product-options-bottom {
423423
.box-tocart {
@@ -473,7 +473,7 @@
473473
//
474474
// Desktop large
475475
//--------------------------------------
476-
.responsive-min-l(@break) when (@break = @screen-xl) {
476+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-xl) {
477477
.sidebar {
478478
.product-items {
479479
.product-item {
@@ -497,7 +497,7 @@
497497
//
498498
// Category page layout
499499
//--------------------------------------
500-
.responsive-min-l(@break) when (@break = @screen-m) {
500+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
501501
.product-info-main {
502502
float: right;
503503
}
@@ -529,7 +529,7 @@
529529
// Common
530530
//--------------------------------------
531531

532-
.responsive-common() {
532+
& when (@media-common = true) {
533533

534534
//
535535
// Minimum Advertising Price

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@toolbar-mode-icon-font-size: 24px;
1010
@toolbar-element-background: @panel-bg;
1111

12-
.responsive-common() {
12+
& when (@media-common = true) {
1313

1414
.page-products .columns {
1515
position: relative;
@@ -96,7 +96,7 @@
9696
// Mobile
9797
//--------------------------------------
9898

99-
.responsive-min-m(@break) when (@break = @screen-s) {
99+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-s) {
100100
.page-products .columns {
101101
position: relative;
102102
z-index: 1;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Common
77
//--------------------------------------
88

9-
.responsive-common() {
9+
& when (@media-common = true) {
1010

1111
.block-product-link,
1212
.block-category-link {
@@ -50,7 +50,7 @@
5050
// Mobile
5151
//--------------------------------------
5252

53-
.responsive-min-m(@break) when (@break = @screen-s) {
53+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-s) {
5454
.block.widget .products-grid .product-item,
5555
.page-layout-1column .block.widget .products-grid .product-item,
5656
.page-layout-3columns .block.widget .products-grid .product-item { width: 100%/3 }
@@ -60,13 +60,13 @@
6060
// Desktop
6161
//--------------------------------------
6262

63-
.responsive-min-l(@break) when (@break = @screen-m) {
63+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
6464
.block.widget .products-grid .product-item{ width: 100%/3 }
6565
.page-layout-1column .block.widget .products-grid .product-item { width: 100%/4 }
6666
.page-layout-3columns .block.widget .products-grid .product-item { width: 100%/2 }
6767
}
6868

69-
.responsive-min-l(@break) when (@break = @screen-l) {
69+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-l) {
7070
.block.widget .products-grid .product-item { width: 100%/5 }
7171
.page-layout-1column .block.widget .products-grid .product-item {
7272
width: 100%/6;
@@ -90,7 +90,7 @@
9090
}
9191
}
9292

93-
.responsive-min-l(@break) when (@break = @screen-m) {
93+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
9494
.sidebar .block.widget .pager {
9595
.item:not(.pages-item-next):not(.pages-item-previous) {
9696
&:extend(.abs-no-display-desktop all);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Common
1313
//--------------------------------------
1414

15-
.responsive-common() {
15+
& when (@media-common = true) {
1616

1717
.block-search {
1818
margin-bottom: 0;
@@ -155,15 +155,15 @@
155155
//
156156
// Mobile
157157
//--------------------------------------
158-
.responsive-max-m(@break) when (@break = @screen-m) {
158+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
159159
.block-search {
160160
.block-content {
161161
margin-bottom: 0;
162162
}
163163
}
164164
}
165165

166-
.responsive-max-m(@break) when (@break = @screen-s) {
166+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-s) {
167167
.block-search {
168168
margin-top: @indent-s-base;
169169
}
@@ -172,7 +172,7 @@
172172
//
173173
// Desktop
174174
//--------------------------------------
175-
.responsive-min-l(@break) when (@break = @screen-m) {
175+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
176176
.block-search {
177177
position: relative;
178178
float: right;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Common
77
//--------------------------------------
88

9-
.responsive-common() {
9+
& when (@media-common = true) {
1010

1111
//
1212
// Shopping cart
@@ -321,7 +321,7 @@
321321
//
322322
// Mobile
323323
//--------------------------------------
324-
.responsive-max-m(@break) when (@break = @screen-m) {
324+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
325325
.cart {
326326
&.table-wrapper {
327327
thead {
@@ -361,7 +361,7 @@
361361
//
362362
// Desktop
363363
//--------------------------------------
364-
.responsive-min-l(@break) when (@break = @screen-m) {
364+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
365365
.cart {
366366
&-container {
367367
&:extend(.abs-add-clearfix-desktop all);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Common
77
//--------------------------------------
88

9-
.responsive-common() {
9+
& when (@media-common = true) {
1010

1111
//
1212
// Minicart
@@ -222,13 +222,13 @@
222222
//
223223
// Mobile
224224
//--------------------------------------
225-
.responsive-max-m(@break) when (@break = @screen-xs) {
225+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-xs) {
226226
.minicart-wrapper .block-minicart {
227227
width: 290px;
228228
}
229229
}
230230

231-
.responsive-max-m(@break) when (@break = @screen-s) {
231+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-s) {
232232
.minicart-wrapper {
233233
margin-top: @indent-s-base;
234234
}
@@ -237,7 +237,7 @@
237237
//
238238
// Desktop
239239
//--------------------------------------
240-
.responsive-min-l(@break) when (@break = @screen-m) {
240+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
241241
.minicart-wrapper {
242242
margin-left: 13px;
243243
.block-minicart {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Common
1212
//--------------------------------------
1313

14-
.responsive-common() {
14+
& when (@media-common = true) {
1515

1616
//
1717
// One Page Checkout
@@ -361,7 +361,7 @@
361361
//
362362
// Mobile
363363
//--------------------------------------
364-
.responsive-max-m(@break) when (@break = @screen-s) {
364+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-s) {
365365
.opc-wrapper {
366366
table.data.table {
367367
&:extend(.abs-checkout-order-review all);
@@ -372,7 +372,7 @@
372372
//
373373
// Desktop
374374
//--------------------------------------
375-
.responsive-min-m(@break) when (@break = @screen-s) {
375+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-s) {
376376
.checkout-onepage-index .column.main {
377377
&:extend(.abs-add-clearfix-desktop-s all);
378378
}

0 commit comments

Comments
 (0)