Skip to content

Commit 49e7d04

Browse files
zanileezanilee
committed
MAGETWO-32274: Base Styles
- CR changes
1 parent 88506b9 commit 49e7d04

File tree

17 files changed

+455
-437
lines changed

17 files changed

+455
-437
lines changed

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

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
> .message:last-child {
2929
margin-bottom: 0;
3030
}
31-
&.license { // license message in view\adminhtml\checker\reminder.phtml
31+
&.license {
32+
// License message in view\adminhtml\checker\reminder.phtml
3233
font-size: 20px;
3334
line-height: 1.2;
3435
margin: 20px auto;
@@ -39,53 +40,52 @@
3940
}
4041

4142
.message {
42-
position: relative;
4343
background: @alert__bg-color;
4444
color: @alert__color;
45-
padding: 1.8rem 4rem 1.8rem 1.9rem;
4645
margin-bottom: 3.5rem;
46+
padding: 1.8rem 4rem 1.8rem 1.9rem;
47+
position: relative;
4748
text-shadow: none;
4849

4950
&:before {
50-
position: absolute;
51-
left: 1.9rem;
52-
top: 50%;
53-
margin-top: -1.3rem;
5451
background: none;
55-
text-shadow: none;
56-
width: auto;
57-
height: auto;
5852
border: 0;
5953
font-family: @icon-font-admin-name;
6054
font-size: @alert__font-size;
6155
font-style: normal;
6256
font-weight: normal;
57+
-webkit-font-smoothing: antialiased;
58+
height: auto;
59+
left: 1.9rem;
6360
line-height: inherit;
61+
margin-top: -1.3rem;
62+
position: absolute;
6463
speak: none;
65-
-webkit-font-smoothing: antialiased;
66-
64+
text-shadow: none;
65+
top: 50%;
66+
width: auto;
6767
}
6868
&-info,
6969
&.info {
7070
padding-left: 5rem;
7171
&:before {
72-
content: "\e61a";
7372
color: @alert-icon__info__color;
73+
content: '\e61a';
7474
}
7575
}
7676
&-error,
7777
&.error {
7878
padding-left: 5rem;
7979
&:before {
80-
content: '\e623';
8180
color: @alert-icon__error__color;
81+
content: '\e623';
8282
}
8383
}
8484
&.success {
8585
padding-left: 5rem;
8686
&:before {
87-
content: '\e62d';
8887
color: @alert-icon__success__color;
88+
content: '\e62d';
8989
}
9090
}
9191
}
@@ -108,28 +108,28 @@
108108
display: none;
109109
}
110110
.message-inner {
111-
position: relative;
112-
min-width: 960px;
113-
max-width: 1300px;
114111
margin: 0 auto;
112+
max-width: 1300px;
113+
min-width: 960px;
114+
position: relative;
115115
&:before {
116116
background: none;
117117
border: 0;
118-
content: '\e006'; /* notification icon */
119118
color: #6e685e;
119+
content: '\e006'; // Notification icon
120120
font-family: 'MUI-Icons';
121+
font-size: 16px;
122+
-webkit-font-smoothing: antialiased;
121123
font-style: normal;
122124
font-weight: normal;
123-
speak: none;
124-
-webkit-font-smoothing: antialiased;
125125
height: auto;
126126
left: 8px;
127127
margin-top: -10px;
128128
position: absolute;
129+
speak: none;
129130
text-shadow: none;
130131
top: 50%;
131132
width: auto;
132-
font-size: 16px;
133133
}
134134
}
135135
.message-content {
@@ -143,9 +143,9 @@
143143

144144
.message-noscript {
145145
background: #ff9;
146-
padding: 0;
147146
border: 0;
148147
box-shadow: 0 1px 2px #46433d;
148+
padding: 0;
149149
z-index: 994;
150150
&:before {
151151
content: '';
@@ -158,32 +158,32 @@
158158
position: relative;
159159
text-align: center;
160160
&:before {
161-
position: relative;
162161
background: none;
163-
text-shadow: none;
164-
width: auto;
165-
height: auto;
166-
vertical-align: middle;
167162
border: 0;
163+
color: #6e685e;
164+
content: '\e006'; // Notification icon
168165
font-family: 'MUI-Icons';
166+
font-size: 32px;
167+
-webkit-font-smoothing: antialiased;
169168
font-style: normal;
170169
font-weight: normal;
171-
font-size: 32px;
170+
height: auto;
171+
position: relative;
172172
speak: none;
173-
-webkit-font-smoothing: antialiased;
174-
content: '\e006'; /* notification icon */
175-
color: #6e685e;
173+
text-shadow: none;
174+
vertical-align: middle;
175+
width: auto;
176176
}
177177
}
178178
}
179179

180180
.message-demo-mode {
181181
background: #d75f07;
182182
border: 0;
183-
color: #fff;
184-
text-align: center;
185-
padding: 5px 0;
186183
box-shadow: 0 1px 2px #46433d;
184+
color: @color-white;
185+
padding: 5px 0;
186+
text-align: center;
187187
z-index: 993;
188188
&:before {
189189
content: '';
@@ -195,20 +195,20 @@
195195
position: relative;
196196
text-align: center;
197197
&:before {
198-
position: relative;
199198
background: none;
200-
text-shadow: none;
201-
width: auto;
202-
height: auto;
203-
vertical-align: middle;
204199
border: 0;
200+
content: '\e006'; // Notification icon
205201
font-family: 'MUI-Icons';
202+
font-size: 16px;
203+
-webkit-font-smoothing: antialiased;
206204
font-style: normal;
207-
speak: none;
208205
font-weight: normal;
209-
-webkit-font-smoothing: antialiased;
210-
font-size: 16px;
211-
content: '\e006'; /* notification icon */
206+
height: auto;
207+
position: relative;
208+
speak: none;
209+
text-shadow: none;
210+
vertical-align: middle;
211+
width: auto;
212212
}
213213
}
214214
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
}
7777

7878
.action-large {
79-
padding: @button-base__large__padding-vertical @button-base__large__padding-horizontal;
8079
font-size: @button-base__large__font-size;
80+
padding: @button-base__large__padding-vertical @button-base__large__padding-horizontal;
8181
}
8282

8383
//
@@ -111,7 +111,7 @@
111111
.action-primary {
112112
background-color: @button-primary__bg-color;
113113
color: @button-primary__color;
114-
text-shadow: 1px 1px 1px rgba(0,0,0,.3);
114+
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
115115
&:hover,
116116
&:focus,
117117
&:active {
@@ -152,13 +152,13 @@
152152
// ---------------------------------------------
153153

154154
.action-reset {
155-
background-color: rgba(0,0,0,0);
156-
border-color: rgba(0,0,0,0);
155+
background-color: rgba(0, 0, 0, 0);
156+
border-color: rgba(0, 0, 0, 0);
157157
color: @color-gray20;
158158
&:hover,
159159
&:focus,
160160
&:active {
161-
background-color: rgba(0,0,0,0);
161+
background-color: rgba(0, 0, 0, 0);
162162
}
163163
}
164164

@@ -184,21 +184,21 @@
184184

185185
.actions-split {
186186
.dropdown-split(
187-
@_toggle-selector: ~".action-toggle",
188-
@_button-selector: ~".action-default",
189-
@_options-selector : ~".dropdown-menu",
190-
@_dropdown-split-button-border-radius-fix: true,
191-
@_dropdown-split-list-min-width: 175px,
192-
@_icon-font-size: 40px,
193-
@_icon-font-line-height: 14px,
194-
@_icon-font-vertical-align: middle
187+
@_toggle-selector: ~".action-toggle",
188+
@_button-selector: ~".action-default",
189+
@_options-selector : ~".dropdown-menu",
190+
@_dropdown-split-button-border-radius-fix: true,
191+
@_dropdown-split-list-min-width: 175px,
192+
@_icon-font-size: 40px,
193+
@_icon-font-line-height: 14px,
194+
@_icon-font-vertical-align: middle
195195
);
196196
vertical-align: middle;
197197
button {
198198
margin-left: 0;
199199
&.action-toggle {
200-
padding: @button-base__padding-vertical 0;
201200
border-left: 1px solid #c34706;
201+
padding: @button-base__padding-vertical 0;
202202
}
203203
&.action-large {
204204
&.action-toggle {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// LESS Extend
88
// ---------------------------------------------
99

10-
// Buttons
10+
// Buttons
1111
button {
1212
&:extend(.action all);
1313

@@ -24,7 +24,7 @@ button {
2424
}
2525
}
2626

27-
// Validation
27+
// Validation
2828
.validation-symbol {
2929
&:after {
3030
content: '*';

‎app/design/adminhtml/Magento/backend/web/css/source/_forms.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@import 'forms/_forms';
6+
@import 'forms/_forms';

0 commit comments

Comments
 (0)