Skip to content

Commit ee8a8a5

Browse files
committed
MAGETWO-31855: UI improvements
- updates for hex color variables
1 parent 95b3c89 commit ee8a8a5

File tree

13 files changed

+369
-364
lines changed

13 files changed

+369
-364
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
//--------------------------------------
201201
.review {
202202
&-toolbar {
203-
border-top: 1px solid #c9c9c9;
203+
border-top: 1px solid @color-gray79;
204204
margin: 0 0 @indent-base;
205205
text-align: center;
206206
&:first-child {
@@ -209,7 +209,7 @@
209209
.pages {
210210
display: block;
211211
text-align: center;
212-
border-bottom: 1px solid #c9c9c9;
212+
border-bottom: 1px solid @color-gray79;
213213
padding: @indent-base 0;
214214
}
215215
.limiter {
@@ -260,7 +260,7 @@
260260
}
261261
&-item {
262262
padding: @indent-base 0;
263-
border-bottom: 1px solid #c9c9c9;
263+
border-bottom: 1px solid @color-gray79;
264264
margin: 0;
265265
.clearer();
266266
&:last-child {

app/design/frontend/Magento/blank/web/css/print.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
// Don't show links for images, or javascript/internal links */
2828
pre,
2929
blockquote {
30-
border: 1px solid #999;
30+
border: 1px solid @color-gray60;
3131
page-break-inside: avoid;
3232
}
3333
thead {
@@ -40,7 +40,7 @@
4040
}
4141
table-layout: fixed;
4242
& > tfoot > tr:first-child {
43-
border-top: 1px solid #999;
43+
border-top: 1px solid @color-gray60;
4444
}
4545
}
4646
.box,

app/design/frontend/Magento/blank/web/css/source/navigation.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
.css(transition, left .3s, 1);
7979

8080
.switcher {
81-
border-top: 1px solid #D1D1D1;
81+
border-top: 1px solid @color-gray82;
8282
margin: 0;
8383
font-size: 1.6rem;
8484
padding: 8px 20px;
@@ -88,7 +88,7 @@
8888
margin-bottom: @indent-xs-base;
8989
}
9090
&:last-child {
91-
border-bottom: 1px solid #D1D1D1;
91+
border-bottom: 1px solid @color-gray82;
9292
}
9393
&-trigger {
9494
strong {
@@ -122,15 +122,15 @@
122122
.header.links {
123123
.list-reset-styles();
124124
li {
125-
border-top: 1px solid #D1D1D1;
125+
border-top: 1px solid @color-gray82;
126126
margin: 0;
127127
font-size: 1.6rem;
128128
&.greet.welcome {
129129
padding: 8px 20px;
130130
font-weight: 700;
131131
}
132132
&:last-child {
133-
border-bottom: 1px solid #D1D1D1;
133+
border-bottom: 1px solid @color-gray82;
134134
}
135135
}
136136
a, a:hover

app/design/frontend/Magento/blank/web/css/source/theme.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@link-color-visited: @link-color;
99

1010
// Introduce new theme specific variables
11-
@sidebar-background: #f5f5f5; // Used in cart sidebar, Checkout sidebar, Tier Prices, My account navigation, Rating block background
11+
@sidebar-background: @color-white-smoke; // Used in cart sidebar, Checkout sidebar, Tier Prices, My account navigation, Rating block background
1212

1313
@h1-font-size: ceil((@font-size-base * 1.85)); // 26px
1414
@h1-font-size-desktop: ceil((@font-size-base * 2.85)); // 40px

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
margin-bottom: @indent-l-base;
3939
.fieldset > .field {
4040
padding-top: @form-field-vertical-indent;
41-
border-top: 1px #e4e4e4 solid;
41+
border-top: 1px @color-gray-middle1 solid;
4242
&:first-of-type {
4343
border-top: 0;
4444
padding-top: 0;
@@ -82,7 +82,7 @@
8282
}
8383
> .title,
8484
.bundle-summary .subtitle {
85-
border-bottom: 1px #e4e4e4 solid;
85+
border-bottom: 1px @color-gray-middle1 solid;
8686
padding-bottom: 16px;
8787
margin-bottom: @indent-m-base;
8888
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
.products-grid &:hover {
236236
margin: -10px;
237237
padding: 9px;
238-
border: 1px solid #bbb;
238+
border: 1px solid @color-gray-light2;
239239
@_shadow: 3px 3px 4px 0 rgba(0, 0, 0, .3);
240240
.css(box-shadow, @_shadow);
241241
position: relative;
@@ -255,7 +255,7 @@
255255
.css(background, @color-white);
256256
padding: 0 9px 9px 9px;
257257
margin: 9px 0 0 -1px;
258-
border: 1px solid #bbb;
258+
border: 1px solid @color-gray-light2;
259259
border-top: none;
260260
@_shadow: 3px 4px 4px 0 rgba(0, 0, 0, .3);
261261
.css(box-shadow, @_shadow);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
@import "listings.less";
66
@import "toolbar.less";
77

8-
@product-info-price: #575757;
8+
@product-info-price: @color-gray34;
99
@product-h1-margin-bottom-desktop: @indent-s-base + @indent-xs-base;
1010

1111
//
@@ -149,7 +149,7 @@
149149

150150
.product-info-main {
151151
.product-info-price {
152-
border-bottom: 1px #c1c1c1 solid;
152+
border-bottom: 1px @color-gray-light5 solid;
153153
display: table;
154154
width: 100%;
155155
.css(color, @product-info-price);

app/design/frontend/Magento/luma/Magento_Downloadable/web/css/source/module.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
}
7979
.field.choice {
8080
box-sizing: border-box;
81-
border-bottom: 1px solid #ebebeb;
81+
border-bottom: 1px solid @color-gray92;
8282
padding-bottom: @indent-s-base;
8383
margin-bottom: @indent-s-base;
8484
&:extend(.clearer all);
@@ -138,7 +138,7 @@
138138
}
139139
}
140140
.page-product-downloadable .product-info-price ~ *:last-child:after {
141-
border-bottom: 1px #c1c1c1 solid;
141+
border-bottom: 1px @color-gray-light5 solid;
142142
content: '';
143143
display: block;
144144
height: 0;

app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/module.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
.css(color, @color-white);
3838
min-width: 1em;
3939
line-height: 1;
40-
background: #fc5e10;
40+
background: @color-orange-red4;
4141
}
4242
&.disabled {
4343
opacity: .5;
@@ -382,7 +382,7 @@
382382
&:before {
383383
content: "";
384384
display: block;
385-
.arrow(up,8px,#000);
385+
.arrow(up, 8px, @color-black);
386386
position: absolute;
387387
left: 50%;
388388
bottom: -1px;

app/design/frontend/Magento/luma/Magento_Review/web/css/source/module.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
.review {
7979
&-toolbar {
8080
padding: 0;
81-
border-top: 1px solid #c9c9c9;
81+
border-top: 1px solid @color-gray79;
8282
margin: 0 0 @indent-base;
8383
text-align: center;
8484
&:first-child {
@@ -87,7 +87,7 @@
8787
.pages {
8888
display: block;
8989
text-align: center;
90-
border-bottom: 1px solid #c9c9c9;
90+
border-bottom: 1px solid @color-gray79;
9191
padding: @indent-base 0;
9292
}
9393
.limiter {
@@ -154,7 +154,7 @@
154154
}
155155
&-item {
156156
padding: @indent-base 0;
157-
border-bottom: 1px solid #c9c9c9;
157+
border-bottom: 1px solid @color-gray79;
158158
margin: 0;
159159
.clearer();
160160
&:last-child {

0 commit comments

Comments
 (0)