Skip to content

Commit b1dc71a

Browse files
committed
MAGETWO-86867: [Tech Debt] Revise LESS/CSS classes and icons
1 parent 5210aff commit b1dc71a

File tree

9 files changed

+103
-97
lines changed

9 files changed

+103
-97
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ body {
5151
margin: 0 0 40px;
5252

5353
.lib-typography(
54-
@_color: #333,
54+
@_color: @color-gray20,
5555
@_font-family: false,
5656
@_font-size: 40px,
5757
@_font-style: false,
@@ -64,7 +64,7 @@ body {
6464
margin: 25px 0 20px;
6565

6666
.lib-typography(
67-
@_color: #333,
67+
@_color: @color-gray20,
6868
@_font-family: false,
6969
@_font-size: 26px,
7070
@_font-style: false,
@@ -74,10 +74,10 @@ body {
7474
}
7575

7676
h3 {
77-
margin: @margin 0 10px;
77+
margin: 20px 0 10px;
7878

7979
.lib-typography(
80-
@_color: #333,
80+
@_color: @color-gray20,
8181
@_font-family: false,
8282
@_font-size: 18px,
8383
@_font-style: false,
@@ -87,10 +87,10 @@ body {
8787
}
8888

8989
h4 {
90-
margin: @margin 0;
90+
margin: 20px 0;
9191

9292
.lib-typography(
93-
@_color: #333,
93+
@_color: @color-gray20,
9494
@_font-family: false,
9595
@_font-size: 14px,
9696
@_font-style: false,
@@ -100,10 +100,10 @@ body {
100100
}
101101

102102
h5 {
103-
margin: @margin 0;
103+
margin: 20px 0;
104104

105105
.lib-typography(
106-
@_color: #333,
106+
@_color: @color-gray20,
107107
@_font-family: false,
108108
@_font-size: 12px,
109109
@_font-style: false,
@@ -113,10 +113,10 @@ body {
113113
}
114114

115115
h6 {
116-
margin: @margin 0;
116+
margin: 20px 0;
117117

118118
.lib-typography(
119-
@_color: #333,
119+
@_color: @color-gray20,
120120
@_font-family: false,
121121
@_font-size: 10px,
122122
@_font-style: false,
@@ -129,7 +129,7 @@ body {
129129
// Text
130130
//
131131
p {
132-
color: #333;
132+
color: @color-gray20;
133133
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
134134
font-size: 14px;
135135
font-style: normal;
@@ -139,9 +139,9 @@ body {
139139
}
140140

141141
pre {
142-
background-color: #f6f6f6;
142+
background-color: @color-white-smoke;
143143
border: @pre__border-width solid #ccc;
144-
color: #111;
144+
color: @color-black;
145145
font-family: @font-family__monospace;
146146
font-size: @code__font-size;
147147
font-style: normal;
@@ -152,8 +152,8 @@ body {
152152
}
153153

154154
.cms-content-important {
155-
background-color: @light_grey;
156-
color: #333;
155+
background-color: @color-white-smoke;
156+
color: @color-gray20;
157157
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
158158
font-size: 22px;
159159
font-style: normal;

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

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
// */
55

66
.pagebuilder-content-type {
7+
display: inline-block;
8+
font-size: 14px;
9+
width: 100%;
710
[contenteditable=true] {
811
-webkit-user-select: text;
912
user-select: text;
@@ -84,78 +87,73 @@
8487
}
8588
}
8689

87-
&.pagebuilder-content-type {
88-
display: inline-block;
89-
font-size: 14px;
90-
width: 100%;
90+
&.pagebuilder-abstract {
91+
background: @entity-color;
92+
color: @color-white;
93+
text-align: center;
94+
95+
i {
96+
font-size: 24px;
97+
}
98+
99+
h3 {
100+
margin: 6px 0 0;
101+
padding: 0;
102+
}
91103

92-
&.pagebuilder-abstract {
93-
background: @entity-color;
104+
* {
94105
color: @color-white;
106+
}
107+
}
108+
109+
.pagebuilder-loading {
110+
left: 50%;
111+
position: absolute;
112+
top: 50%;
113+
transform: translate(-50%, -50%);
114+
}
115+
116+
&.pagebuilder-image {
117+
.pagebuilder-image-placeholder {
118+
background: @color-white-fog;
119+
cursor: pointer;
120+
font-size: 12px;
121+
padding: 30px 0 16px;
95122
text-align: center;
96123

97124
i {
98-
font-size: 24px;
125+
font-size: 34px;
126+
margin-bottom: 8px;
99127
}
100128

101-
h3 {
102-
margin: 6px 0 0;
103-
padding: 0;
129+
p {
130+
padding: 0 20px;
104131
}
132+
}
133+
134+
&.loading {
105135

106-
* {
107-
color: @color-white;
136+
img {
137+
opacity: .5;
108138
}
109139
}
110140

111-
.pagebuilder-loading {
112-
left: 50%;
113-
position: absolute;
114-
top: 50%;
115-
transform: translate(-50%, -50%);
141+
.dz-message,
142+
.dz-preview {
143+
display: none;
116144
}
117145

118-
&.pagebuilder-image {
146+
&.dz-drag-hover {
147+
img,
119148
.pagebuilder-image-placeholder {
120-
background: @color-white-fog;
121-
cursor: pointer;
122-
font-size: 12px;
123-
padding: 30px 0 16px;
124-
text-align: center;
125-
126-
i {
127-
font-size: 34px;
128-
margin-bottom: 8px;
129-
}
130-
131-
p {
132-
padding: 0 20px;
133-
}
134-
}
135-
136-
&.loading {
137-
138-
img {
139-
opacity: .5;
140-
}
141-
}
142-
143-
.dz-message,
144-
.dz-preview {
145-
display: none;
146-
}
147-
148-
&.dz-drag-hover {
149-
img,
150-
.pagebuilder-image-placeholder {
151-
-moz-filter: blur(5px);
152-
-webkit-filter: blur(5px);
153-
filter: blur(5px);
154-
opacity: .6;
155-
}
149+
-moz-filter: blur(5px);
150+
-webkit-filter: blur(5px);
151+
filter: blur(5px);
152+
opacity: .6;
156153
}
157154
}
158155
}
156+
159157
}
160158

161159
.no-user-select {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
.pagebuilder-content-type {
1111
.pagebuilder-button-item {
12-
width: auto;
1312
font-size: 0;
13+
width: auto;
1414
[contenteditable=true] {
1515
display: inline-block;
1616
min-height: 18px;

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,5 @@
2020
p {
2121
margin-bottom: @margin;
2222
}
23-
ul {
24-
list-style: disc;
25-
padding-left: @margin;
26-
li {
27-
margin: 0 0 @margin 0;
28-
}
29-
}
3023
}
3124
}

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/uploader/preview/_image.less

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
// Image Uploader PageBuilder Stage UI Component
88
// _____________________________________________
99

10+
@color-light-blue: #e6f0f4;
11+
@color-light-rose: #ffe6dd;
12+
@color-medium-blue: #529cdb;
13+
@color-red: #f00;
14+
1015
.pagebuilder-image-uploader-container {
1116
align-items: center;
1217
display: flex;
@@ -79,15 +84,15 @@
7984
}
8085

8186
&.dragging-outside .pagebuilder-image-uploader-container-dropzone-overlay {
82-
background-color: #e6f0f4;
83-
border-color: #529cdb;
84-
color: #529cdb;
87+
background-color: @color-light-blue;
88+
border-color: @color-medium-blue;
89+
color: @color-medium-blue;
8590
}
8691

8792
&.dragging-inside .pagebuilder-image-uploader-container-dropzone-overlay {
88-
background-color: #ffe6dd;
89-
border-color: #f00;
90-
color: #f00;
93+
background-color: @color-light-rose;
94+
border-color: @color-red;
95+
color: @color-red;
9196
}
9297

9398
.preview-image-container-loading-overlay {

app/code/Magento/PageBuilder/view/frontend/web/css/source/_module.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
@import 'content-type/_import.less';
1717

1818
.cms-content-important {
19-
background-color: #f5f5f5;
20-
color: #333;
19+
background-color: @color-white-smoke;
20+
color: @color-gray20;
2121
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
2222
font-size: 22px;
2323
font-style: normal;

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,14 @@
88
// _____________________________________________
99

1010
@import 'accordion/_import.less';
11-
@import 'anchor/_import.less';
1211
@import 'banner/_import.less';
13-
@import 'block/_import.less';
1412
@import 'button-item/_import.less';
15-
@import 'buttons/_import.less';
16-
@import 'buttons/_import.less';
17-
@import 'children/_import.less';
1813
@import 'column/_import.less';
1914
@import 'column-group/_import.less';
20-
@import 'divider/_import.less';
21-
@import 'heading/_import.less';
22-
@import 'html/_import.less';
2315
@import 'image/_import.less';
2416
@import 'map/_import.less';
25-
@import 'newsletter/_import.less';
2617
@import 'products/_import.less';
27-
@import 'row/_import.less';
2818
@import 'slide/_import.less';
2919
@import 'slider/_import.less';
30-
@import 'tab-item/_import.less';
3120
@import 'tabs/_import.less';
32-
@import 'text/_import.less';
3321
@import 'video/_import.less';
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// /**
2+
// * Copyright © Magento, Inc. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Default appearance styles
8+
// _____________________________________________
9+
10+
[data-role='map'] {
11+
width: 100%;
12+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// /**
2+
// * Copyright © Magento, Inc. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// _import imports all appearance less files
8+
// _____________________________________________
9+
10+
@import './_default.less';

0 commit comments

Comments
 (0)