Skip to content

Commit be268e8

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request #46 from magento-webdev/PR-4
[WebDev] Bugfixes
2 parents 4525716 + ba2da05 commit be268e8

File tree

12 files changed

+475
-411
lines changed

12 files changed

+475
-411
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,9 +558,12 @@
558558
.product-info-main {
559559
float: right;
560560
}
561+
561562
.product.media {
562563
float: left;
564+
margin-bottom: @indent__m;
563565
}
566+
564567
.page-layout-1column {
565568
.product-info-main {
566569
width: 40%;
@@ -569,6 +572,7 @@
569572
width: 57%;
570573
}
571574
}
575+
572576
.page-layout-2columns-left,
573577
.page-layout-2columns-right,
574578
.page-layout-3columns {

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

Lines changed: 84 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -4,105 +4,109 @@
44
// */
55

66
//
7-
// Common
8-
//--------------------------------------
7+
// Common
8+
// _____________________________________________
99

1010
@toolbar-mode-icon-font-size: 24px;
1111
@toolbar-element-background: @panel__background-color;
1212

1313
& when (@media-common = true) {
1414

15-
.page-products .columns {
16-
position: relative;
17-
z-index: 1;
18-
}
19-
20-
.toolbar {
21-
&:extend(.abs-add-clearfix all);
22-
&-amount {
23-
display: block;
24-
line-height: @toolbar-mode-icon-font-size+2;
25-
padding: 8px 0 0;
26-
margin: 0;
27-
vertical-align: middle;
28-
.products.wrapper ~ .toolbar & {
29-
display: none;
15+
.page-products {
16+
.columns {
17+
position: relative;
18+
z-index: 1;
3019
}
3120
}
32-
&-products {
33-
margin-bottom: @indent__xl;
34-
text-align: center;
35-
padding: 0 @indent__s;
21+
22+
.toolbar {
3623
&:extend(.abs-add-clearfix all);
37-
.pages {
38-
display: none;
39-
.products.wrapper ~ & {
40-
display: block;
24+
&-amount {
25+
display: block;
26+
line-height: @toolbar-mode-icon-font-size+2;
27+
margin: 0;
28+
padding: 8px 0 0;
29+
vertical-align: middle;
30+
.products.wrapper ~ .toolbar & {
31+
display: none;
4132
}
4233
}
43-
.limiter {
44-
display: none;
45-
.control {
46-
display: inline-block;
34+
&-products {
35+
margin-bottom: @indent__xl;
36+
padding: 0 @indent__s;
37+
text-align: center;
38+
&:extend(.abs-add-clearfix all);
39+
.pages {
40+
display: none;
41+
.products.wrapper ~ & {
42+
display: block;
43+
}
44+
}
45+
.limiter {
46+
display: none;
47+
.control {
48+
display: inline-block;
49+
}
4750
}
4851
}
4952
}
50-
}
5153

52-
.sorter {
53-
padding: 4px 0 0;
54-
.products.wrapper ~ .toolbar & {
55-
display: none;
56-
}
57-
&-options {
58-
margin: 0 0 0 7px;
59-
width: auto;
60-
}
61-
&-action {
62-
vertical-align: top;
63-
.lib-icon-font(
54+
.sorter {
55+
padding: 4px 0 0;
56+
.products.wrapper ~ .toolbar & {
57+
display: none;
58+
}
59+
&-options {
60+
margin: 0 0 0 7px;
61+
width: auto;
62+
}
63+
&-action {
64+
vertical-align: top;
65+
.lib-icon-font(
6466
@icon-arrow-up,
6567
@_icon-font-size: 28px,
6668
@_icon-font-line-height: 32px,
6769
@_icon-font-color: @header-icons-color,
6870
@_icon-font-color-hover: @header-icons-color-hover,
6971
@_icon-font-text-hide: true
70-
);
71-
&.sort-desc:before {
72-
content: @icon-arrow-down;
72+
);
73+
&.sort-desc:before {
74+
content: @icon-arrow-down;
75+
}
7376
}
7477
}
75-
}
7678

77-
.modes {
78-
display: none;
79-
}
80-
81-
.limiter {
82-
&-options {
83-
width: auto;
84-
margin: 0 5px 0 7px;
85-
}
86-
&-label {
87-
font-weight: 400;
88-
}
89-
.page-products .toolbar & {
79+
.modes {
9080
display: none;
9181
}
92-
}
9382

83+
.limiter {
84+
&-options {
85+
width: auto;
86+
margin: 0 5px 0 7px;
87+
}
88+
&-label {
89+
font-weight: 400;
90+
}
91+
.page-products .toolbar & {
92+
display: none;
93+
}
94+
}
9495
}
9596

9697
//
97-
// Mobile
98-
// ---------------------------------------------
98+
// Desctop
99+
// _____________________________________________
99100

100101
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__s) {
101-
.page-products .columns {
102-
position: relative;
103-
z-index: 1;
104-
padding-top: 0;
102+
.page-products {
103+
.columns {
104+
padding-top: 0;
105+
position: relative;
106+
z-index: 1;
107+
}
105108
}
109+
106110
.toolbar {
107111
.products.wrapper ~ & .pages {
108112
float: left;
@@ -111,19 +115,24 @@
111115
float: left;
112116
}
113117
}
118+
114119
.sorter {
115120
float: right;
116121
}
122+
117123
.modes {
118-
float: left;
119124
display: inline-block;
125+
float: left;
120126
margin-right: @indent__base;
127+
121128
.products.wrapper ~ .toolbar & {
122129
display: none;
123130
}
131+
124132
&-label {
125133
&:extend(.abs-visually-hidden-desktop-s all);
126134
}
135+
127136
&-mode {
128137
.lib-css(color, @text__color__muted);
129138
border: 1px solid @border-color__base;
@@ -134,8 +143,8 @@
134143
padding: 7px 10px;
135144
text-align: center;
136145
&:not(.active):hover {
137-
background: darken(@toolbar-element-background, 7%);
138146
.lib-css(color, @text__color__muted);
147+
background: darken(@toolbar-element-background, 7%);
139148
}
140149
&:last-child {
141150
border-right: 1px solid @border-color__base;
@@ -144,15 +153,19 @@
144153
.lib-css(color, @primary__color__light);
145154
}
146155
.lib-icon-font(
147-
@icon-grid,
148-
@_icon-font-size: @toolbar-mode-icon-font-size,
149-
@_icon-font-text-hide: true
156+
@icon-grid,
157+
@_icon-font-size: @toolbar-mode-icon-font-size,
158+
@_icon-font-text-hide: true,
159+
@_icon-font-color: @text__color__muted,
160+
@_icon-font-color-hover: @text__color__muted
150161
);
151162
}
152163
}
164+
153165
.mode-list {
154166
.lib-icon-font-symbol(@icon-list);
155167
}
168+
156169
.limiter {
157170
float: right;
158171
.products.wrapper ~ .toolbar & {

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
}
5050
.subtitle {
5151
display: none;
52-
}
53-
.subtitle {
5452
&.empty {
5553
display: block;
5654
font-size: 14px;
@@ -124,10 +122,14 @@
124122
right: 26px;
125123
}
126124
}
127-
.product.actions {
128-
text-align: right;
129-
> .primary, > .secondary {
130-
display: inline;
125+
.product {
126+
.actions {
127+
float: right;
128+
margin: -24px 0 0;
129+
text-align: right;
130+
> .primary, > .secondary {
131+
display: inline;
132+
}
131133
}
132134
}
133135

@@ -165,7 +167,7 @@
165167
text-align: center;
166168
white-space: normal;
167169
&.empty {
168-
&:extend(.abs-no-display all);
170+
display: none;
169171
}
170172
.loader {
171173
> img {
@@ -184,8 +186,8 @@
184186
}
185187

186188
.minicart-items-wrapper {
187-
.lib-css(margin, 0 -@minicart__padding-horizontal);
188189
.lib-css(border, 1px solid @minicart__border-color);
190+
.lib-css(margin, 0 -@minicart__padding-horizontal);
189191
border-left: 0;
190192
border-right: 0;
191193
overflow-x: auto;
@@ -301,12 +303,12 @@
301303
text-align: center;
302304
width: 40px;
303305
}
304-
.item-update {
306+
.update-cart-item {
305307
.lib-font-size(11);
306308
vertical-align: top;
307309
}
308310
.subtitle {
309-
&:extend(.abs-no-display all);
311+
display: none;
310312
}
311313
.action {
312314
&.edit,

0 commit comments

Comments
 (0)