Skip to content

Commit c1ffce1

Browse files
author
Oleg Zinoviev
committed
MAGETWO-31855: UI improvements
- hex colors moved to variables.
1 parent eba73a5 commit c1ffce1

File tree

2 files changed

+172
-92
lines changed

2 files changed

+172
-92
lines changed

app/design/frontend/Magento/luma/web/css/source/lib/variables.less

Lines changed: 93 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,52 @@
1717

1818
// Colors
1919
@color-white: #fff;
20+
@color-black: #000;
21+
2022
@color-gray20: #333;
23+
@color-gray34: #575757;
24+
@color-gray55: #8c8c8c;
2125
@color-gray56: #8f8f8f;
26+
@color-gray64: #a3a3a3;
27+
@color-gray68: #adadad;
28+
@color-gray76: #c2c2c2;
29+
@color-gray78: #c7c7c7;
30+
@color-gray80: #ccc;
31+
@color-gray82: #d1d1d1;
32+
@color-gray90: #e5e5e5;
33+
@color-gray91: #e8e8e8;
34+
@color-gray94: #f0f0f0;
35+
@color-gray95: #f2f2f2;
36+
37+
@color-gray-light0: #f6f6f6;
38+
@color-gray-light1: #e5efe5;
39+
@color-gray-light2: #bbb;
40+
@color-gray-light3: #aeaeae;
41+
42+
@color-gray-darken0: #eee;
43+
@color-gray-darken1: #e2e2e2;
44+
@color-gray-darken2: #cdcdcd;
45+
@color-gray-darken3: #555;
46+
47+
@color-red10: #e02b27;
48+
@color-red11: #b30000;
49+
@color-orange-red1: #ff5501;
50+
@color-orange-red2: #ff5601;
51+
@color-orange-red3: #ff5700;
52+
53+
@color-dark-green1: #006400;
54+
55+
@color-blue1: #1979c3;
56+
@color-blue2: #006bb4;
57+
@color-sky-blue1: #68a8e0;
58+
59+
@color-pink1: #fae5e5;
60+
@color-dark-pink1: #800080;
61+
62+
@color-brownie1: #6f4400;
63+
@color-brownie-light1: #c07600;
64+
65+
@color-yellow-light1: #fdf0d5;
2266

2367
// Color nesting
2468
@color-background-page: @color-white;
@@ -28,13 +72,13 @@
2872
@color-primary-darker: darken(@color-primary, 13.5%); // #111
2973
@color-primary-lighter: lighten(@color-primary, 29%); // #7d7d7d
3074
@color-primary-light: lighten(@color-primary, 45%); // #a6a6a6
31-
@color-secondary: #e8e8e8;
75+
@color-secondary: @color-gray91;
3276
@color-secondary-light: lighten(@color-secondary, 5%);
3377
@page-bg-color: @color-white;
34-
@panel-bg: #f6f6f6;
35-
@color-active: #ff5501;
36-
@color-error: #e02b27;
37-
@color-focus: #68a8e0;
78+
@panel-bg: @color-gray-light0;
79+
@color-active: @color-orange-red1;
80+
@color-error: @color-red10;
81+
@color-focus: @color-sky-blue1;
3882

3983
@font-family-base: @font-family-sans-serif; // Also used in: @loader-text-font-family
4084
// setting font-size for HTML tag, use <b>%</b> units
@@ -72,17 +116,17 @@
72116
@indent-s-base: @indent-base / 2; // 10px
73117
@indent-xs-base: @indent-base / 4; // 5px
74118

75-
@border-color-base: #ccc;
119+
@border-color-base: @color-gray80;
76120
@border-width-base: 1px;
77121

78122
// Links
79-
@link-color: #1979c3;
123+
@link-color: @color-blue1;
80124
@link-text-decoration: none;
81125

82-
@link-color-visited: #800080;
126+
@link-color-visited: @color-dark-pink1;
83127
@link-text-decoration-visited: none;
84128

85-
@link-color-hover: #006bb4;
129+
@link-color-hover: @color-blue2;
86130
@link-text-decoration-hover: underline;
87131

88132
@link-color-active: @color-active;
@@ -323,7 +367,7 @@
323367
//
324368
// Navigation variables
325369
//--------------------------------------
326-
@navigation-background: #f0f0f0;
370+
@navigation-background: @color-gray94;
327371
@navigation-border: '';
328372
@navigation-level0-font-size: 16;
329373
@navigation-level0-font-weight: @font-weight-bold;
@@ -333,8 +377,8 @@
333377
@navigation-level0-text-transform: uppercase;
334378

335379
@navigation-level0-item-background: '';
336-
@navigation-level0-item-border: 1px solid #d1d1d1;
337-
@navigation-level0-item-color: #575757;
380+
@navigation-level0-item-border: 1px solid @color-gray82;
381+
@navigation-level0-item-color: @color-gray34;
338382
@navigation-level0-item-text-decoration: none;
339383

340384
@navigation-level0-item-background-active: '';
@@ -351,7 +395,7 @@
351395

352396
@submenu-item-background: '';
353397
@submenu-item-border: '';
354-
@submenu-item-color: #575757;
398+
@submenu-item-color: @color-gray34;
355399
@submenu-item-text-decoration: '';
356400

357401
@submenu-item-background-active: '';
@@ -371,7 +415,7 @@
371415

372416
@navigation-desktop-level0-item-background: '';
373417
@navigation-desktop-level0-item-border: '';
374-
@navigation-desktop-level0-item-color: #575757;
418+
@navigation-desktop-level0-item-color: @color-gray34;
375419
@navigation-desktop-level0-item-text-decoration: none;
376420

377421
@navigation-desktop-level0-item-background-hover: '';
@@ -530,7 +574,7 @@
530574

531575
// Default = secondary button
532576
@button-color: @color-primary;
533-
@button-background: #eee;
577+
@button-background: @color-gray-darken0;
534578
@button-border: 1px solid @border-color-base;
535579
@button-gradient-start-color: false;
536580
@button-gradient-end-color: false;
@@ -542,7 +586,7 @@
542586
@button-gradient-end-color-hover: false;
543587

544588
@button-color-active: @button-color;
545-
@button-background-active: #e2e2e2;
589+
@button-background-active: @color-gray-darken1;
546590
@button-border-active: @button-border;
547591
@button-gradient-start-color-active: false;
548592
@button-gradient-end-color-active: false;
@@ -555,20 +599,20 @@
555599
@button-primary-gradient: false;
556600
@button-primary-gradient-direction: false;
557601

558-
@button-primary-background: #1979c3;
559-
@button-primary-border: 1px solid #1979c3;
602+
@button-primary-background: @color-blue1;
603+
@button-primary-border: 1px solid @color-blue1;
560604
@button-primary-color: @color-white;
561605
@button-primary-gradient-start-color: false;
562606
@button-primary-gradient-end-color: false;
563607

564-
@button-primary-background-hover: #006bb4;
565-
@button-primary-border-hover: 1px solid #006bb4;
608+
@button-primary-background-hover: @color-blue2;
609+
@button-primary-border-hover: 1px solid @color-blue2;
566610
@button-primary-color-hover: @color-white;
567611
@button-primary-gradient-start-color-hover: false;
568612
@button-primary-gradient-end-color-hover: false;
569613

570-
@button-primary-background-active: #006bb4;
571-
@button-primary-border-active: 1px solid #006bb4;
614+
@button-primary-background-active: @color-blue2;
615+
@button-primary-border-active: 1px solid @color-blue2;
572616
@button-primary-color-active: @color-white;
573617
@button-primary-gradient-start-color-active: false;
574618
@button-primary-gradient-end-color-active: false;
@@ -703,16 +747,16 @@
703747
@message-border-radius: false;
704748

705749
// Information message
706-
@message-info-color: #6f4400;
707-
@message-info-background: #fdf0d5;
750+
@message-info-color: @color-brownie1;
751+
@message-info-background: @color-yellow-light1;
708752
@message-info-link-color: @link-color;
709753
@message-info-link-color-hover: @link-color-hover;
710754
@message-info-link-color-active: @link-color-hover;
711755
@message-info-border-color: @message-border-color;
712756
@message-info-icon: @icon-warning;
713-
@message-info-icon-color-inner: #c07600;
757+
@message-info-icon-color-inner: @color-brownie-light1;
714758
@message-info-icon-color-lateral: @color-white;
715-
@message-info-icon-background: #6f4400;
759+
@message-info-icon-background: @color-brownie1;
716760
@message-info-icon-top: @message-icon-top;
717761
@message-info-icon-right: @message-icon-right;
718762
@message-info-icon-bottom: @message-icon-bottom;
@@ -736,31 +780,31 @@
736780

737781
// Error message
738782
@message-error-color: @color-error;
739-
@message-error-background: #fae5e5;
783+
@message-error-background: @color-pink1;
740784
@message-error-link-color: @link-color;
741785
@message-error-link-color-hover: @link-color-hover;
742786
@message-error-link-color-active: @link-color-hover;
743787
@message-error-border-color: @message-border-color;
744788
@message-error-icon: @icon-error;
745-
@message-error-icon-color-inner: #b30000;
789+
@message-error-icon-color-inner: @color-red11;
746790
@message-error-icon-color-lateral: @color-white;
747-
@message-error-icon-background: #b30000;
791+
@message-error-icon-background: @color-red11;
748792
@message-error-icon-top: @message-icon-top;
749793
@message-error-icon-right: @message-icon-right;
750794
@message-error-icon-bottom: @message-icon-bottom;
751795
@message-error-icon-left: @message-icon-left;
752796

753797
// Success message
754-
@message-success-color: #006400;
755-
@message-success-background: #e5efe5;
798+
@message-success-color: @color-dark-green1;
799+
@message-success-background: @color-gray-light1;
756800
@message-success-link-color: @link-color;
757801
@message-success-link-color-hover: @link-color-hover;
758802
@message-success-link-color-active: @link-color-hover;
759803
@message-success-border-color: @message-border-color;
760804
@message-success-icon: @icon-success;
761-
@message-success-icon-color-inner: #006400;
805+
@message-success-icon-color-inner: @color-dark-green1;
762806
@message-success-icon-color-lateral: @color-white;
763-
@message-success-icon-background: #006400;
807+
@message-success-icon-background: @color-dark-green1;
764808
@message-success-icon-top: @message-icon-top;
765809
@message-success-icon-right: @message-icon-right;
766810
@message-success-icon-bottom: @message-icon-bottom;
@@ -786,7 +830,7 @@
786830
// Tooltips variables
787831
//--------------------------------------
788832
@tooltip-background: @color-white;
789-
@tooltip-border-color: #bbb;
833+
@tooltip-border-color: @color-gray-light2;
790834
@tooltip-border-width: 1px;
791835
@tooltip-border-radius: false;
792836
@tooltip-color: @color-primary;
@@ -833,7 +877,7 @@
833877
// Form elements inputs default variables
834878
@form-element-input-type: ''; // input-text, select, textarea, input-radio, input-checkbox
835879
@form-element-input-background: @color-white;
836-
@form-element-input-border-color: #c2c2c2;
880+
@form-element-input-border-color: @color-gray76;
837881
@form-element-input-border: 1px solid @form-element-input-border-color;
838882
@form-element-input-border-radius: 1px;
839883
@form-element-input-height: 32px;
@@ -850,7 +894,7 @@
850894
@form-element-input-line-height: @line-height-base;
851895

852896
// Placeholder
853-
@form-element-input-placeholder-color: #c2c2c2;
897+
@form-element-input-placeholder-color: @color-gray76;
854898
@form-element-input-placeholder-font-style: @form-element-input-font-style;
855899

856900
// Disabled state
@@ -1062,7 +1106,7 @@
10621106
@form-field-type-inline-control-width: 74.2%;
10631107

10641108
// Form field label asterisk
1065-
@form-field-label-asterisk-color: #e02b27; // also used in: @form-hasrequired-color
1109+
@form-field-label-asterisk-color: @color-red10; // also used in: @form-hasrequired-color
10661110
@form-field-label-asterisk-font-size: @font-size-s;
10671111
@form-field-label-asterisk-font-family: false;
10681112
@form-field-label-asterisk-font-weight: false;
@@ -1123,7 +1167,7 @@
11231167
@pager-current-font-weight: @font-weight-bold;
11241168
@pager-current-color: @color-primary;
11251169
@pager-current-border: false;
1126-
@pager-current-background: #e5e5e5;
1170+
@pager-current-background: @color-gray90;
11271171

11281172
@pager-current-gradient: false;
11291173
@pager-current-gradient-direction: false;
@@ -1219,8 +1263,8 @@
12191263
@rating-icon-font: @icon-font;
12201264
@rating-icon-font-size: 16px;
12211265
@rating-icon-letter-spacing: 2px;
1222-
@rating-icon-color: #c7c7c7;
1223-
@rating-icon-color-active: #ff5501;
1266+
@rating-icon-color: @color-gray78;
1267+
@rating-icon-color-active: @color-orange-red1;
12241268
@rating-label-hide: false;
12251269

12261270
//
@@ -1239,15 +1283,15 @@
12391283
@dropdown-list-position-left: false;
12401284
@dropdown-list-pointer: true; // true | false
12411285
@dropdown-list-background: @color-white;
1242-
@dropdown-list-border: 1px solid #bbb;
1243-
@dropdown-list-pointer-border: #bbb;
1286+
@dropdown-list-border: 1px solid @color-gray-light2;
1287+
@dropdown-list-pointer-border: @color-gray-light2;
12441288
@dropdown-list-pointer-position: left; // right
12451289
@dropdown-list-pointer-position-top: -12px;
12461290
@dropdown-list-pointer-position-left-right: 10px;
12471291
@dropdown-list-item-border: 0;
12481292
@dropdown-list-item-padding: 3px 5px;
12491293
@dropdown-list-item-margin: 0;
1250-
@dropdown-list-item-hover: #e8e8e8;
1294+
@dropdown-list-item-hover: @color-gray91;
12511295
@dropdown-list-shadow: 0 3px 3px rgba(0,0,0,.15); // '' | none
12521296
@dropdown-list-z-index: 100;
12531297

@@ -1342,7 +1386,7 @@
13421386
@breadcrumbs-icon-font-vertical-align: top;
13431387

13441388
// Breadcrumbs - current page
1345-
@breadcrumbs-current-color: #a3a3a3;
1389+
@breadcrumbs-current-color: @color-gray64;
13461390
@breadcrumbs-current-font-weight: @font-weight-base;
13471391
@breadcrumbs-current-background: false;
13481392
@breadcrumbs-current-border: false;
@@ -1396,7 +1440,7 @@
13961440
@popup-height: auto;
13971441
@popup-padding: 22px;
13981442
@popup-background: @color-white;
1399-
@popup-border-color: #adadad;
1443+
@popup-border-color: @color-gray68;
14001444
@popup-border: 1px solid @popup-border-color;
14011445
@popup-shadow: 0 3px 3px rgba(0,0,0,.15);
14021446
@popup-fade: opacity .3s linear;
@@ -1447,19 +1491,19 @@
14471491
@popup-icon-font: @button-icon-font;
14481492
@popup-icon-font-size: 16px;
14491493
@popup-icon-font-line-height: 16px;
1450-
@popup-icon-font-color: #8c8c8c;
1451-
@popup-icon-font-color-hover: darken(#8c8c8c, 10%);
1494+
@popup-icon-font-color: @color-gray55;
1495+
@popup-icon-font-color-hover: darken(@color-gray55, 10%);
14521496
@popup-icon-font-color-active: @popup-icon-font-color-hover;
14531497
@popup-icon-font-margin: @button-icon-font-margin;
14541498
@popup-icon-font-vertical-align: @button-icon-font-vertical-align;
14551499
@popup-icon-font-position: @button-icon-font-position;
14561500
@popup-icon-font-text-hide: true;
14571501

14581502
// Window overlay variables
1459-
@overlay-background: #8c8c8c;
1503+
@overlay-background: @color-gray55;
14601504
@overlay-opacity: .7;
14611505
@overlay-opacity-old: 70;
14621506
@overlay-fade: opacity .15s linear;
14631507
@overlay-z-index: 1000;
14641508

1465-
@gallery-thumb-border-color-active: #ff5700;
1509+
@gallery-thumb-border-color-active: @color-orange-red3;

0 commit comments

Comments
 (0)