Skip to content

Commit 6453bee

Browse files
author
Oleg Zinoviev
committed
Merge branch 'MAGETWO-32274' into UI
2 parents b774dd9 + c6e93c2 commit 6453bee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+3375
-130
lines changed

‎app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
<css src="mui/components.css"/>
1515
<css src="css/admin.css"/>
1616
<css src="css/pages.css"/>
17-
<css src="css/styles.css"/>
17+
<css src="css/styles-old.css"/>
1818
<css src="jquery/farbtastic/css/farbtastic.css"/>
1919
<css src="mui/utils.css"/>
2020
<css src="Magento_Core::prototype/magento.css"/>
2121
<css src="mui/print.css" media="print"/>
2222
</head>
23+
2324
<body/>
2425
</page>

‎app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
*/
6+
-->
7+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
8+
<head>
9+
<remove src="mui/reset.css"/>
10+
<remove src="mui/base.css"/>
11+
<remove src="mui/elements.css"/>
12+
<remove src="mui/form.css"/>
13+
<remove src="mui/components.css"/>
14+
<remove src="css/admin.css"/>
15+
<remove src="css/pages.css"/>
16+
<remove src="css/styles-old.css"/>
17+
<remove src="jquery/farbtastic/css/farbtastic.css"/>
18+
<remove src="mui/utils.css"/>
19+
<remove src="Magento_Core::prototype/magento.css"/>
20+
<remove src="mui/print.css"/>
21+
22+
<css src="css/styles.css"/>
23+
</head>
24+
<body/>
25+
</page>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//@import "formelements.less";

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

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Variables
8+
// _____________________________________________
9+
10+
// Colors
11+
@alert__bg-color: @color-lazy-sunny;
12+
@alert__color: @color-gray20;
13+
14+
// Sizes
15+
@alert__font-size: 1.9rem;
16+
17+
// States
18+
@alert-icon__info__color: @color-pure-blue;
19+
@alert-icon__error__color: @color-phoenix;
20+
@alert-icon__success__color: @color-green-apple;
21+
22+
//
23+
// Messages (Global)
24+
// ---------------------------------------------
25+
26+
.messages {
27+
margin: 20px 0;
28+
> .message:last-child {
29+
margin-bottom: 0;
30+
}
31+
}
32+
33+
.message {
34+
background: @alert__bg-color;
35+
color: @alert__color;
36+
margin-bottom: 3.5rem;
37+
padding: 1.8rem 4rem 1.8rem 1.9rem;
38+
position: relative;
39+
text-shadow: none;
40+
41+
&:before {
42+
background: none;
43+
border: 0;
44+
font-family: @icon-font-admin-name;
45+
font-size: @alert__font-size;
46+
font-style: @font-style-regular;
47+
font-weight: @font-weight-regular;
48+
height: auto;
49+
left: 1.9rem;
50+
line-height: inherit;
51+
margin-top: -1.3rem;
52+
position: absolute;
53+
speak: none;
54+
text-shadow: none;
55+
top: 50%;
56+
width: auto;
57+
}
58+
&-info,
59+
&.info {
60+
padding-left: 5rem;
61+
&:before {
62+
color: @alert-icon__info__color;
63+
content: @icon-info;
64+
}
65+
}
66+
&-error,
67+
&.error {
68+
padding-left: 5rem;
69+
&:before {
70+
color: @alert-icon__error__color;
71+
content: @icon-error;
72+
}
73+
}
74+
&.success {
75+
padding-left: 5rem;
76+
&:before {
77+
color: @alert-icon__success__color;
78+
content: @icon-check-mage;
79+
}
80+
}
81+
}

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

Lines changed: 214 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,214 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Variables
8+
// _____________________________________________
9+
10+
// Sizes
11+
@button-base__font-size: 1.4rem;
12+
@button-base__padding-vertical: .55em;
13+
@button-base__padding-horizontal: 1em;
14+
15+
// Colors
16+
@button-base__color: @color-brownie;
17+
@button-base__bg-color: @color-gray89;
18+
19+
@button-primary__color: @color-white;
20+
@button-primary__bg-color: @color-phoenix;
21+
22+
@button-secondary__color: @color-white;
23+
@button-secondary__bg-color: @color-brownie;
24+
@button-secondary__border-color: @color-brownie;
25+
26+
@button-tertiary__color: @color-gray20;
27+
@button-tertiary__bg-color: @color-gray89;
28+
@button-tertiary__border-color: @color-dark-grayish;
29+
30+
// States
31+
@button-base__large__font-size: 1.6rem;
32+
@button-base__large__padding-vertical: .7em;
33+
@button-base__large__padding-horizontal: 1.45em;
34+
35+
@button-base__hover__bg-color: darken(@button-base__bg-color, 3%);
36+
@button-base__hover__box-shadow: 0 0 0 1px @color-dodger-blue;
37+
@button-base__active__bg-color: darken(@button-base__bg-color, 5%);
38+
39+
@button-primary__hover__bg-color: @color-phoenix-brown;
40+
@button-primary__hover__border-color: @color-phoenix-brown;
41+
42+
@button-secondary__hover__bg-color: @color-very-dark-gray-black2;
43+
@button-secondary__active__bg-color: @color-very-dark-gray-black2;
44+
45+
@button-tertiary__hover_bg-color: @color-lighter-grayish;
46+
@button-tertiary__hover__border-color: @color-gray56;
47+
48+
//
49+
// Common
50+
// _____________________________________________
51+
52+
.action {
53+
background: @button-base__bg-color;
54+
border: 1px solid transparent;
55+
color: @button-base__color;
56+
display: inline-block;
57+
font-family: @font-family-base;
58+
font-size: @button-base__font-size;
59+
font-weight: @font-weight-regular;
60+
padding: @button-base__padding-vertical @button-base__padding-horizontal;
61+
text-align: center;
62+
vertical-align: middle;
63+
&:hover {
64+
background-color: @button-base__hover__bg-color;
65+
.css(box-shadow, @button-base__hover__box-shadow);
66+
color: @button-base__color;
67+
text-decoration: none;
68+
}
69+
&:active {
70+
background-color: @button-base__active__bg-color;
71+
}
72+
&[disabled],
73+
&.disabled {
74+
cursor: default;
75+
opacity: @opacity-disabled;
76+
pointer-events: none;
77+
}
78+
}
79+
80+
.action-large {
81+
font-size: @button-base__large__font-size;
82+
padding: @button-base__large__padding-vertical @button-base__large__padding-horizontal;
83+
}
84+
85+
//
86+
// Buttons
87+
// _____________________________________________
88+
89+
//
90+
// Link button
91+
// ---------------------------------------------
92+
93+
.action-link {
94+
background-color: transparent;
95+
border: none;
96+
color: @color-link;
97+
font-family: @font-family-base;
98+
font-size: 1.4rem;
99+
&:hover,
100+
&:active {
101+
background-color: transparent;
102+
border-color: transparent;
103+
color: @color-link-hover;
104+
text-decoration: underline;
105+
}
106+
}
107+
108+
//
109+
// Primary button
110+
// ---------------------------------------------
111+
112+
.action-primary {
113+
background-color: @button-primary__bg-color;
114+
color: @button-primary__color;
115+
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
116+
&:hover,
117+
&:active {
118+
background-color: @button-primary__hover__bg-color;
119+
border-color: @button-primary__hover__border-color;
120+
color: @button-primary__color;
121+
}
122+
&.disabled,
123+
&[disabled] {
124+
cursor: default;
125+
opacity: @opacity-disabled;
126+
pointer-events: none;
127+
}
128+
}
129+
130+
//
131+
// Secondary button
132+
// ---------------------------------------------
133+
134+
.action-secondary {
135+
background-color: @button-secondary__bg-color;
136+
border-color: @button-secondary__border-color;
137+
color: @button-secondary__color;
138+
text-shadow: 1px 1px 1px rgba(0, 0, 0, .3);
139+
&:hover,
140+
&:active {
141+
background-color: @button-secondary__hover__bg-color;
142+
color: @button-secondary__color;
143+
}
144+
&:active {
145+
background-color: @button-secondary__active__bg-color;
146+
}
147+
}
148+
149+
//
150+
// Default button
151+
// ---------------------------------------------
152+
153+
.action-reset {
154+
background-color: transparent;
155+
border-color: transparent;
156+
color: @color-gray20;
157+
&:hover,
158+
&:active {
159+
background-color: transparent;
160+
}
161+
}
162+
163+
//
164+
// Tertiary button
165+
// ---------------------------------------------
166+
167+
.action-tertiary {
168+
background: @button-tertiary__bg-color;
169+
border-color: @button-tertiary__border-color;
170+
color: @button-tertiary__color;
171+
&:hover,
172+
&:active {
173+
background-color: @button-tertiary__hover_bg-color;
174+
border-color: @button-tertiary__hover__border-color;
175+
}
176+
}
177+
178+
//
179+
// Split button
180+
// ---------------------------------------------
181+
182+
.actions-split {
183+
.dropdown-split(
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
192+
);
193+
&:hover {
194+
&:not(.disabled) {
195+
.css(box-shadow, @button-base__hover__box-shadow);
196+
}
197+
}
198+
vertical-align: middle;
199+
button {
200+
margin-left: 0;
201+
&.action-toggle {
202+
border-left: 1px solid #c34706;
203+
padding: @button-base__padding-vertical 0;
204+
}
205+
&.action-large {
206+
&.action-toggle {
207+
padding: @button-base__large__padding-vertical 0;
208+
}
209+
}
210+
&:hover {
211+
box-shadow: none;
212+
}
213+
}
214+
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/**
2+
* @category design
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
//
8+
// Components
9+
// _____________________________________________
10+
11+
@import 'components/_navigation';
12+
@import 'components/_spinner';

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// LESS Extend
8+
// ---------------------------------------------
9+
10+
// Buttons
11+
button {
12+
&:extend(.action all);
13+
14+
&.primary {
15+
&:extend(.action-primary all);
16+
}
17+
18+
&.secondary {
19+
&:extend(.action-secondary all);
20+
}
21+
22+
&.tertiary {
23+
&:extend(.action-tertiary all);
24+
}
25+
}
26+
27+
// Validation
28+
.validation-symbol {
29+
&:after {
30+
content: '*';
31+
color: @validation-color;
32+
font-weight: @font-weight-regular;
33+
margin-left: 3px;
34+
}
35+
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
@import 'forms/_forms';

0 commit comments

Comments
 (0)