Skip to content

Commit 65c9997

Browse files
author
Michael Yu
committed
MAGETWO-91923 static test failures
- Fixed more less file static test failures
1 parent a4faad0 commit 65c9997

File tree

10 files changed

+48
-47
lines changed

10 files changed

+48
-47
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@black: #000;
6+
@color-black: #000;
77

88
[data-role='modal'] {
99
.action-pagebuilder-cancel,
1010
.action-pagebuilder-cancel:hover {
11-
color: @black;
11+
color: @color-black;
1212
}
1313

1414
.pagebuilder-modal-content-body li {

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
// */
55

66
@border-size: 2px;
7-
@white: #fff;
7+
@color-white: #fff;
8+
@color-black: #000;
89

910
.pagebuilder-header {
1011
text-align: right;
@@ -21,7 +22,7 @@
2122

2223
.pagebuilder-stage-wrapper {
2324
&.stage-full-screen {
24-
background: @white;
25+
background: @color-white;
2526
height: 100%;
2627
left: 0;
2728
overflow: scroll;
@@ -43,7 +44,7 @@
4344
-webkit-border-radius: 5px;
4445
background: @row-color;
4546
border-radius: 5px;
46-
color: @white;
47+
color: @color-white;
4748
display: inline-block;
4849
font-size: 26px;
4950
height: 50px;
@@ -69,7 +70,7 @@
6970
user-select: none;
7071

7172
&.stage-full-screen {
72-
background: @black;
73+
background: @color-black;
7374
}
7475

7576
&.pagebuilder-no-user-select {

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@white: #fff;
6+
@color-white: #fff;
77
@f8f8f8: #f8f8f8;
88
@eee: #eee;
99
@dark-gray: #534d49;
10-
@light_gray: #f8f3eb;
10+
@light-gray: #f8f3eb;
11+
@darker-gray: #2b2625;
1112

1213
.pagebuilder-content-type {
1314
[contenteditable=true] {
@@ -97,7 +98,7 @@
9798

9899
&.pagebuilder-abstract {
99100
background: @entityColor;
100-
color: @white;
101+
color: @color-white;
101102
text-align: center;
102103

103104
i {
@@ -110,7 +111,7 @@
110111
}
111112

112113
* {
113-
color: @white;
114+
color: @color-white;
114115
}
115116
}
116117

@@ -395,7 +396,7 @@
395396
}
396397

397398
.pagebuilder-options-wrapper {
398-
background: @white;
399+
background: @color-white;
399400
border: 1px solid rgba(153, 153, 153, .7);
400401
box-shadow: 0 2px 6px rgba(0, 0, 0, .3);
401402
display: flex;
@@ -420,7 +421,7 @@
420421
}
421422

422423
.pagebuilder-options-links {
423-
background: @white;
424+
background: @color-white;
424425
display: flex;
425426
list-style: none;
426427
margin: 0;
@@ -437,7 +438,7 @@
437438
cursor: not-allowed;
438439

439440
&:hover {
440-
background-color: #fff;
441+
background-color: @color-white;
441442
color: @color-dark-gray;
442443
}
443444
}
@@ -479,7 +480,7 @@
479480
}
480481

481482
&:hover:not(&.option-title) {
482-
background-color: #eee;
483+
background-color: @eee;
483484
color: @color-very-dark-gray-black;
484485
}
485486
}
@@ -516,7 +517,7 @@
516517

517518
.pagebuilder-options-wrapper {
518519
&:after {
519-
background: @white;
520+
background: @color-white;
520521
border: 1px solid rgba(153, 153, 153, .7);
521522
bottom: -6px;
522523
content: '';
@@ -574,11 +575,11 @@
574575
.pagebuilder-live-edit-wrapper {
575576
-moz-border-radius: 3px;
576577
-webkit-border-radius: 3px;
577-
background: #2b2625;
578+
background: @darker-gray;
578579
border: none;
579580
border-radius: 3px;
580581
box-shadow: 0 1px 2px rgba(0, 0, 0, .25);
581-
color: #f8f3eb;
582+
color: @light-gray;
582583
display: none;
583584
left: 10px !important;
584585
overflow: hidden;
@@ -613,7 +614,7 @@
613614
display: inline-block;
614615

615616
a {
616-
color: @white;
617+
color: @color-white;
617618
display: block;
618619
font-size: 13px;
619620
line-height: 42px;

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_default.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727

2828
.pagebuilder-column-resize-handle {
29-
background: #bfe2f0;
29+
background: @light-blue;
3030
bottom: 0;
3131
cursor: col-resize;
3232
opacity: 0;

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_default.less

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@gray: #aaa6a0;
7-
@white: #fff;
8-
@yellow: #fffbbb;
6+
@color-gray: #aaa6a0;
7+
@color-white: #fff;
8+
@color-yellow: #fffbbb;
99
@light-gray: #afadac;
1010
@c-gray: #ccc;
1111
@dark-gray: #373330;
12-
@blue: #007bdb;
12+
@color-blue: #007bdb;
1313
@b3: #b3b3b3;
1414
@darker-gray: #1c1918;
1515

@@ -54,7 +54,7 @@
5454

5555
.slider-empty {
5656
align-items: flex-end;
57-
color: @gray;
57+
color: @color-gray;
5858
display: flex;
5959
font-size: 20px;
6060
font-weight: lighter;
@@ -91,7 +91,7 @@
9191
);
9292

9393
.tooltip-content {
94-
background: @yellow;
94+
background: @color-yellow;
9595
border: 1px solid @light-gray;
9696
border-radius: 1px;
9797
bottom: 97.5%;
@@ -123,7 +123,7 @@
123123
z-index: 3;
124124
}
125125
&:after {
126-
border-top-color: @yellow;
126+
border-top-color: @color-yellow;
127127
z-index: 4;
128128
}
129129
}
@@ -142,7 +142,7 @@
142142
}
143143

144144
&:after {
145-
background: @white;
145+
background: @color-white;
146146
border: 1px solid @c-gray;
147147
border-radius: 10px;
148148
content: ' ';
@@ -212,7 +212,7 @@
212212
}
213213

214214
&:focus {
215-
outline: 1px solid @blue;
215+
outline: 1px solid @color-blue;
216216

217217
.pagebuilder-options {
218218
.pagebuilder-options-visible;

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
@f6: #f6f6f6;
77
@ccc: #ccc;
8-
@black: #000;
9-
@white: #fff;
8+
@color-black: #000;
9+
@color-white: #fff;
1010

1111
//
1212
// Default appearance styles
@@ -36,7 +36,7 @@
3636

3737
a.tab-title {
3838
border-right: 0;
39-
color: @black;
39+
color: @color-black;
4040
cursor: pointer !important;
4141
display: block;
4242
font-size: 14px;
@@ -78,16 +78,15 @@
7878
.abs-icon;
7979
color: @color-dark-gray0;
8080
content: @icon-gripper__content;
81+
cursor: move; /* fallback if grab cursor is unsupported */
82+
cursor: grab;
83+
cursor: -moz-grab;
84+
cursor: -webkit-grab;
8185
display: block;
8286
font-size: 16px;
8387
position: absolute;
8488
top: 50%;
8589
transform: translateY(-50%);
86-
87-
cursor: move; /* fallback if grab cursor is unsupported */
88-
cursor: grab;
89-
cursor: -moz-grab;
90-
cursor: -webkit-grab;
9190
}
9291

9392
&:active:before {
@@ -119,7 +118,7 @@
119118
}
120119

121120
&.ui-state-active {
122-
background: @white;
121+
background: @color-white;
123122
z-index: 19;
124123

125124
a.tab-title {

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_default.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@black: #000;
6+
@color-black: #000;
77
@light-gray: #f8f3eb;
88
@dark-gray: #534d49;
99
@darker-gray: #2b2625;
@@ -19,7 +19,7 @@
1919
padding-bottom: 0;
2020
padding-top: 0;
2121
.redactor-color-picker {
22-
background: @black;
22+
background: @color-black;
2323
border: 2px solid @light-gray;
2424
border-radius: 10px;
2525
float: left;

app/code/Magento/PageBuilder/view/base/web/css/source/hljs/hljs.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
@light-red: #ff79c6;
99
@light-gray: #f8f8f2;
1010
@light-green: #50fa7b;
11-
@yellow: #f1fa8c;
11+
@color-yellow: #f1fa8c;
1212
@dark-purple: #6272a4;
1313
@light-purple: #bd93f9;
1414

@@ -50,7 +50,7 @@
5050
.hljs-variable,
5151
.hljs-template-tag,
5252
.hljs-template-variable {
53-
color: @yellow;
53+
color: @color-yellow;
5454
}
5555

5656
.hljs-comment,

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/accordion/_default.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@gray: #ccc;
6+
@color-gray: #ccc;
77

88
//
99
// Default appearance styles
1010
// _____________________________________________
1111

1212
.pagebuilder-accordion {
1313
.accordion-collapsible {
14-
border-bottom: 1px solid @gray;
14+
border-bottom: 1px solid @color-gray;
1515
cursor: pointer;
1616
font-weight: bold;
1717
padding: 14px 8px;

app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/tabs/_default.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
@f6: #f6f6f6;
77
@ccc: #ccc;
8-
@black: #000;
9-
@white: #fff;
8+
@color-black: #000;
9+
@color-white: #fff;
1010

1111
//
1212
// Default appearance styles
@@ -40,7 +40,7 @@ div[data-role='tabs'] {
4040

4141
a.tab-title {
4242
border-right: 0;
43-
color: @black;
43+
color: @color-black;
4444
cursor: pointer !important;
4545
display: block;
4646
font-size: 14px;
@@ -65,7 +65,7 @@ div[data-role='tabs'] {
6565
}
6666

6767
&.ui-state-active {
68-
background: @white;
68+
background: @color-white;
6969
z-index: 19;
7070

7171
a.tab-title {

0 commit comments

Comments
 (0)