Skip to content

Commit ab454cc

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32274: Base Styles
- Removed some files - UI Kit updates
1 parent 49e7d04 commit ab454cc

File tree

14 files changed

+51
-580
lines changed

14 files changed

+51
-580
lines changed

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

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
@button-base__large__padding-horizontal: 1.45em;
3434

3535
@button-base__hover__bg-color: darken(@button-base__bg-color, 3%);
36+
@button-base__hover__box-shadow: 0 0 0 1px @color-dodger-blue;
3637
@button-base__active__bg-color: darken(@button-base__bg-color, 5%);
3738

3839
@button-primary__hover__bg-color: @color-phoenix-brown;
@@ -61,6 +62,7 @@
6162
vertical-align: middle;
6263
&:hover {
6364
background-color: @button-base__hover__bg-color;
65+
.css(box-shadow, @button-base__hover__box-shadow);
6466
color: @button-base__color;
6567
text-decoration: none;
6668
}
@@ -95,7 +97,6 @@
9597
font-family: @font-family-base;
9698
font-size: 1.4rem;
9799
&:hover,
98-
&:focus,
99100
&:active {
100101
background-color: transparent;
101102
border-color: transparent;
@@ -113,7 +114,6 @@
113114
color: @button-primary__color;
114115
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
115116
&:hover,
116-
&:focus,
117117
&:active {
118118
background-color: @button-primary__hover__bg-color;
119119
border-color: @button-primary__hover__border-color;
@@ -137,7 +137,6 @@
137137
color: @button-secondary__color;
138138
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
139139
&:hover,
140-
&:focus,
141140
&:active {
142141
background-color: @button-secondary__hover__bg-color;
143142
color: @button-secondary__color;
@@ -156,7 +155,6 @@
156155
border-color: rgba(0, 0, 0, 0);
157156
color: @color-gray20;
158157
&:hover,
159-
&:focus,
160158
&:active {
161159
background-color: rgba(0, 0, 0, 0);
162160
}
@@ -171,7 +169,6 @@
171169
border-color: @button-tertiary__border-color;
172170
color: @button-tertiary__color;
173171
&:hover,
174-
&:focus,
175172
&:active {
176173
background-color: @button-tertiary__hover_bg-color;
177174
border-color: @button-tertiary__hover__border-color;
@@ -184,15 +181,20 @@
184181

185182
.actions-split {
186183
.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
184+
@_toggle-selector: ~".action-toggle",
185+
@_button-selector: ~".action-default",
186+
@_options-selector : ~".dropdown-menu",
187+
@_dropdown-split-button-border-radius-fix: true,
188+
@_dropdown-split-list-min-width: 175px,
189+
@_icon-font-size: 40px,
190+
@_icon-font-line-height: 14px,
191+
@_icon-font-vertical-align: middle
195192
);
193+
&:hover {
194+
&:not(.disabled) {
195+
.css(box-shadow, @button-base__hover__box-shadow);
196+
}
197+
}
196198
vertical-align: middle;
197199
button {
198200
margin-left: 0;
@@ -205,5 +207,8 @@
205207
padding: @button-base__large__padding-vertical 0;
206208
}
207209
}
210+
&:hover {
211+
box-shadow: none;
212+
}
208213
}
209214
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@
99
// _____________________________________________
1010

1111
@import 'components/_navigation';
12-
@import 'components/_tooltips';
13-
@import 'components/_progress-bars';
1412
@import 'components/_spinner';

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
@import '_forms';
1818
@import '_tables';
1919
@import '_alerts';
20-
@import '_structures'; // ToDo UI: find out do we need it
2120
@import '_grid';
2221
@import '_extend';
2322

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

Lines changed: 0 additions & 11 deletions
This file was deleted.

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

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,38 @@ body {
5151
// ---------------------------------------------
5252

5353
h1 {
54-
color: @color-dark-brownie;
55-
font-size: 2.8rem;
56-
font-weight: @font-weight-regular;
54+
.typography(
55+
@_font-size: 2.8rem,
56+
@_color: @color-dark-brownie,
57+
@_font-weight: @font-weight-regular,
58+
@_line-height: 3.4rem,
59+
@_font-family: false,
60+
@_font-style: false
61+
);
5762
margin: 0 0 2rem;
5863
}
5964

6065
h2 {
61-
color: @color-dark-brownie;
62-
font-size: 2rem;
63-
font-weight: @font-weight-regular;
66+
.typography(
67+
@_font-size: 2rem,
68+
@_color: @color-dark-brownie,
69+
@_font-weight: @font-weight-regular,
70+
@_line-height: 2.5rem,
71+
@_font-family: false,
72+
@_font-style: false
73+
);
6474
margin: 0 0 2rem;
6575
}
6676

6777
h3 {
68-
color: @color-dark-brownie;
69-
font-size: 1.7rem;
70-
font-weight: @font-weight-semibold;
78+
.typography(
79+
@_font-size: 1.7rem,
80+
@_color: @color-dark-brownie,
81+
@_font-weight: @font-weight-semibold,
82+
@_line-height: 2.2rem,
83+
@_font-family: false,
84+
@_font-style: false
85+
);
7186
margin: 0 0 2rem;
7287
}
7388

@@ -80,7 +95,7 @@ h6 {
8095

8196
// Text
8297
p {
83-
margin: 0 0 1em;
98+
margin: 0 0 1.5em;
8499
}
85100

86101
// Links

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

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

6-
@import 'utilities/_vendor-prefixes';
76
@import 'utilities/_grid-framework';
87
@import 'utilities/_grid';
98
@import 'utilities/_animations';
109
@import 'utilities/_spinner';
11-
12-
// Clip & hide element
13-
.clip() {
14-
clip: rect(0, 0, 0, 0);
15-
position: absolute;
16-
}
17-
18-
//
19-
// Effects
20-
// ---------------------------------------------
21-
22-
.effect-hover-opacity (
23-
@opacity: .85,
24-
@transition: opacity .2s linear) {
25-
transition: @transition;
26-
&:hover {
27-
opacity: @opacity;
28-
}
29-
}

0 commit comments

Comments
 (0)