Skip to content

Commit 19cc8fb

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32274: Base Styles
- CR Updates
1 parent ab454cc commit 19cc8fb

File tree

5 files changed

+45
-191
lines changed

5 files changed

+45
-191
lines changed

app/design/adminhtml/Magento/backend/web/css/source/_alerts.less

Lines changed: 5 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,6 @@
2828
> .message:last-child {
2929
margin-bottom: 0;
3030
}
31-
&.license {
32-
// License message in view\adminhtml\checker\reminder.phtml
33-
font-size: 20px;
34-
line-height: 1.2;
35-
margin: 20px auto;
36-
max-width: 1300px;
37-
min-width: 960px;
38-
padding: 0 20px;
39-
}
4031
}
4132

4233
.message {
@@ -52,9 +43,8 @@
5243
border: 0;
5344
font-family: @icon-font-admin-name;
5445
font-size: @alert__font-size;
55-
font-style: normal;
56-
font-weight: normal;
57-
-webkit-font-smoothing: antialiased;
46+
font-style: @font-style-regular;
47+
font-weight: @font-weight-regular;
5848
height: auto;
5949
left: 1.9rem;
6050
line-height: inherit;
@@ -70,145 +60,22 @@
7060
padding-left: 5rem;
7161
&:before {
7262
color: @alert-icon__info__color;
73-
content: '\e61a';
63+
content: @icon-info;
7464
}
7565
}
7666
&-error,
7767
&.error {
7868
padding-left: 5rem;
7969
&:before {
8070
color: @alert-icon__error__color;
81-
content: '\e623';
71+
content: @icon-error;
8272
}
8373
}
8474
&.success {
8575
padding-left: 5rem;
8676
&:before {
8777
color: @alert-icon__success__color;
88-
content: '\e62d';
89-
}
90-
}
91-
}
92-
93-
.messages-inbox {
94-
float: right;
95-
}
96-
97-
.messages-inbox .critical {
98-
color: @color-phoenix-down;
99-
}
100-
101-
//
102-
// System Messages
103-
// ---------------------------------------------
104-
105-
.message-system {
106-
padding: 0;
107-
&:before {
108-
display: none;
109-
}
110-
.message-inner {
111-
margin: 0 auto;
112-
max-width: 1300px;
113-
min-width: 960px;
114-
position: relative;
115-
&:before {
116-
background: none;
117-
border: 0;
118-
color: #6e685e;
119-
content: '\e006'; // Notification icon
120-
font-family: 'MUI-Icons';
121-
font-size: 16px;
122-
-webkit-font-smoothing: antialiased;
123-
font-style: normal;
124-
font-weight: normal;
125-
height: auto;
126-
left: 8px;
127-
margin-top: -10px;
128-
position: absolute;
129-
speak: none;
130-
text-shadow: none;
131-
top: 50%;
132-
width: auto;
133-
}
134-
}
135-
.message-content {
136-
padding: 10px 26px 10px 32px;
137-
}
138-
}
139-
140-
//
141-
// No-javaScript-Enabled message
142-
// ---------------------------------------------
143-
144-
.message-noscript {
145-
background: #ff9;
146-
border: 0;
147-
box-shadow: 0 1px 2px #46433d;
148-
padding: 0;
149-
z-index: 994;
150-
&:before {
151-
content: '';
152-
}
153-
.message-content {
154-
margin: 0 auto;
155-
max-width: 1300px;
156-
min-width: 960px;
157-
padding: 3px 0;
158-
position: relative;
159-
text-align: center;
160-
&:before {
161-
background: none;
162-
border: 0;
163-
color: #6e685e;
164-
content: '\e006'; // Notification icon
165-
font-family: 'MUI-Icons';
166-
font-size: 32px;
167-
-webkit-font-smoothing: antialiased;
168-
font-style: normal;
169-
font-weight: normal;
170-
height: auto;
171-
position: relative;
172-
speak: none;
173-
text-shadow: none;
174-
vertical-align: middle;
175-
width: auto;
176-
}
177-
}
178-
}
179-
180-
.message-demo-mode {
181-
background: #d75f07;
182-
border: 0;
183-
box-shadow: 0 1px 2px #46433d;
184-
color: @color-white;
185-
padding: 5px 0;
186-
text-align: center;
187-
z-index: 993;
188-
&:before {
189-
content: '';
190-
}
191-
.message-content {
192-
margin: 0 auto;
193-
max-width: 1300px;
194-
min-width: 960px;
195-
position: relative;
196-
text-align: center;
197-
&:before {
198-
background: none;
199-
border: 0;
200-
content: '\e006'; // Notification icon
201-
font-family: 'MUI-Icons';
202-
font-size: 16px;
203-
-webkit-font-smoothing: antialiased;
204-
font-style: normal;
205-
font-weight: normal;
206-
height: auto;
207-
position: relative;
208-
speak: none;
209-
text-shadow: none;
210-
vertical-align: middle;
211-
width: auto;
78+
content: @icon-check-mage;
21279
}
21380
}
21481
}

app/design/adminhtml/Magento/backend/web/css/source/_buttons.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@button-base__bg-color: @color-gray89;
1818

1919
@button-primary__color: @color-white;
20-
@button-primary__bg-color: @color-prime;
20+
@button-primary__bg-color: @color-phoenix;
2121

2222
@button-secondary__color: @color-white;
2323
@button-secondary__bg-color: @color-brownie;
@@ -151,12 +151,12 @@
151151
// ---------------------------------------------
152152

153153
.action-reset {
154-
background-color: rgba(0, 0, 0, 0);
155-
border-color: rgba(0, 0, 0, 0);
154+
background-color: transparent;
155+
border-color: transparent;
156156
color: @color-gray20;
157157
&:hover,
158158
&:active {
159-
background-color: rgba(0, 0, 0, 0);
159+
background-color: transparent;
160160
}
161161
}
162162

app/design/adminhtml/Magento/backend/web/css/source/_extend.less

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,7 @@ button {
2929
&:after {
3030
content: '*';
3131
color: @validation-color;
32-
font-weight: normal;
33-
margin-left: 3px;
34-
}
35-
}
36-
37-
.validation-symbol-light {
38-
&:after {
39-
content: '*';
40-
color: @validation-color-light;
41-
font-weight: normal;
32+
font-weight: @font-weight-regular;
4233
margin-left: 3px;
4334
}
4435
}

app/design/adminhtml/Magento/backend/web/css/source/_icons.less

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

6+
//
7+
// Variables
8+
// _____________________________________________
9+
10+
//
11+
// Icons
12+
// ---------------------------------------------
13+
14+
@icon-info: '\e61a';
15+
@icon-error: '\e632';
16+
@icon-check-mage: '\e62d';
17+
18+
//
619
// Admin Theme Icons
20+
// ---------------------------------------------
21+
722
.font-face(
823
@family-name: @icon-font-admin-name,
924
@font-path: @icon-font-admin-path,
1025
@font-weight: normal,
1126
@font-style: normal
1227
);
1328

29+
//
1430
// Blank Theme Icons
31+
// ---------------------------------------------
32+
1533
.font-face(
1634
@family-name: @icon-font-blank-name,
1735
@font-path: @icon-font-blank-path,
1836
@font-weight: normal,
1937
@font-style: normal
2038
);
2139

40+
//
2241
// MUI Icons
42+
// ---------------------------------------------
43+
2344
.font-face(
2445
@family-name: @icon-font-mui-name,
2546
@font-path: @icon-font-mui-path,
@@ -47,7 +68,7 @@
4768
}
4869

4970
.icon-info:before {
50-
content: '\e61a';
71+
content: @icon-info;
5172
}
5273

5374
.icon-lock:before {
@@ -123,7 +144,7 @@
123144
}
124145

125146
.icon-check-mage:before {
126-
content: '\e62d';
147+
content: @icon-check-mage;
127148
}
128149

129150
.icon-clock:before {
@@ -143,7 +164,7 @@
143164
}
144165

145166
.icon-error:before {
146-
content: '\e632';
167+
content: @icon-error;
147168
}
148169

149170
.icon-help:before {

app/design/adminhtml/Magento/backend/web/css/source/_theme.less

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
// Colors
88
// ---------------------------------------------
99

10-
@color-brownie: #514943;
1110
@color-light-brownie: #676056;
1211
@color-dark-gray: #808080;
1312
@color-very-dark-gray: #666;
@@ -39,80 +38,56 @@
3938
@color-pure-blue: #007bdb;
4039
@color-dodger-blue: #008bdb;
4140
@color-green-apple: #79a22e;
41+
@color-brownie: #514943;
4242
@color-dark-brown: #4a3f39;
4343
@color-dark-brownie: #41362f;
4444
@color-very-dark-gray-black: #303030;
4545
@color-very-dark-gray-black2: #35302c;
4646
@color-very-dark-grayish-orange: #373330;
47-
@color-phoenix-down: #e04f00;
4847
@color-phoenix: #eb5202;
49-
@color-phoenix-almost-rise: #ef672f;
50-
@color-phoenix-rise: #f65405;
5148
@color-phoenix-brown: #b84002;
5249
@color-phoenix-brownie: #ae3d01;
5350
@color-tomato-brick: #e22626;
54-
@color-strawberry-milkshake: #ee7d7d;
55-
56-
// Nesting colors
57-
@color-prime: @color-phoenix;
58-
@color-tertiary: @color-brownie;
59-
@color-success: @color-green-apple;
60-
@color-warning: @color-phoenix-almost-rise;
61-
@color-failed: @color-tomato-brick;
6251

6352
//
6453
// Typography
6554
// ---------------------------------------------
6655

67-
// Focus
68-
@color-focus: @color-dodger-blue;
69-
@focus-box-shadow: 0 0 0 1px @color-focus;
70-
71-
// Disabled
72-
@opacity-disabled: .7;
73-
7456
// Font
7557
@color-base: @color-gray19;
7658
@font-family-base: 'Open Sans', @font-family-sans-serif;
7759
@font-family-console: 'Courier New', Courier, monospace;
7860
@font-size-base: 1.4rem;
7961
@font-size-small: @font-size-base * .85;
62+
@font-style-regular: normal;
8063
@font-weight-light: 300;
8164
@font-weight-regular: 400;
8265
@font-weight-semibold: 600;
8366
@font-weight-bold: 700;
67+
@line-height-base: 1.4;
8468
@color-link: @color-pure-blue;
8569
@color-link-hover: @color-pure-blue;
8670

87-
// Font Icons
71+
// Focus
72+
@color-focus: @color-dodger-blue;
73+
@focus-box-shadow: 0 0 0 1px @color-focus;
74+
75+
// Disabled
76+
@opacity-disabled: .7;
77+
78+
// Admin Font Icons
8879
@icon-font-admin-name: 'UX-Icons';
8980
@icon-font-admin-path: '@{baseDir}fonts/@{icon-font-admin-name}/@{icon-font-admin-name}';
9081

9182
// Legacy Font Icons
9283
@icon-font-blank-name: 'icons-blank-theme';
9384
@icon-font-blank-path: '@{baseDir}fonts/Blank-Theme-Icons/Blank-Theme-Icons';
94-
9585
@icon-font-mui-name: 'MUI-Icons';
9686
@icon-font-mui-path: '@{baseDir}fonts/@{icon-font-mui-name}/@{icon-font-mui-name}';
9787

98-
@line-height-base: 1.4;
99-
@indent-bottom-paragraph: 1em;
100-
101-
//
102-
// Structure
103-
// ---------------------------------------------
104-
105-
@width-container: 100rem;
106-
@indent-container: 2rem;
10788

10889
//
10990
// Validation
11091
// ---------------------------------------------
11192

11293
@validation-color: @color-tomato-brick;
113-
@validation-color-rgba: rgba(226, 38, 38, .6);
114-
@validation-bg: #f9d4d4;
115-
@validation-border: 1px dashed @validation-color;
116-
@validation-color-light: #f9d4d4; // For asterisk on <th> elements of grid tables
117-
118-
// Data-table

0 commit comments

Comments
 (0)