Skip to content

Commit 67b3ce6

Browse files
committed
MAGETWO-48067: Improvement: Colors refactoring
- Merge remote-tracking branch 'origin/MAGETWO-48067' into PR - Conflicts: - app/design/frontend/Magento/blank/web/css/print.less - app/design/frontend/Magento/blank/web/css/source/_email-base.less
2 parents 0efe2c2 + ac75be2 commit 67b3ce6

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
&:not(.admin__field-label) {
5151
:after {
5252
content: '*';
53-
color: red;
53+
color: #f00;
5454
margin-left: 3px;
5555
}
5656
}
@@ -5144,7 +5144,7 @@
51445144
@media print {
51455145
* {
51465146
background: transparent !important;
5147-
color: black !important;
5147+
color: #000 !important;
51485148
box-shadow: none !important;
51495149
text-shadow: none !important;
51505150
filter: none !important;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@media print {
2222
* {
2323
background: transparent !important;
24-
color: black !important;
24+
color: @color-black !important;
2525
-webkit-filter: none !important; // Use in 41 Chrome
2626
filter: none !important;
2727
text-shadow: none !important;
@@ -112,8 +112,8 @@
112112
.order-items {
113113
.order-gift-message {
114114
&:not(.expanded-content) {
115-
visibility: visible;
116115
height: auto;
116+
visibility: visible;
117117
}
118118
}
119119
}

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

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

3333
&[data-count]:after {
3434
.lib-css(color, @color-white);
35-
background: @color-orange-red4;
35+
background: @color-orange-red1;
3636
border-radius: 2px;
3737
content: attr(data-count);
3838
display: inline-block;

lib/web/css/docs/source/_dropdowns.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,8 +909,8 @@
909909
@_dropdown-split-toggle-icon-content: @icon-expand,
910910
@_dropdown-split-toggle-active-icon-content: @icon-collapse,
911911
@_icon-font-position: before,
912-
@_icon-font-color: red,
913-
@_icon-font-color-hover: red
912+
@_icon-font-color: #f00,
913+
@_icon-font-color-hover: #f00
914914
);
915915
}
916916

lib/web/css/source/lib/variables/_colors.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
@color-red12: #d10029;
6262

6363
@color-orange-red1: #ff5501;
64-
@color-orange-red2: #ff5601;
65-
@color-orange-red3: #ff5700;
66-
@color-orange-red4: #fc5e10;
64+
@color-orange-red2: #ff5601; // Legacy orange
65+
@color-orange-red3: #ff5700; // Legacy orange
66+
@color-orange-red4: #fc5e10; // Legacy orange
6767

6868
@color-dark-green1: #006400;
6969

lib/web/css/source/lib/variables/_rating.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
@rating-icon__letter-spacing: -10px;
1515
@rating-icon__color: @color-gray78;
1616

17-
@rating-icon__active__color: @color-orange-red2;
17+
@rating-icon__active__color: @color-orange-red1;
1818

1919
@rating-label__hide: false;

0 commit comments

Comments
 (0)