Skip to content

Commit 88506b9

Browse files
author
Oleg Zinoviev
committed
MAGETWO-32274: Base Styles
1 parent d409839 commit 88506b9

Some content is hidden

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

43 files changed

+3923
-20
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: 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+
// 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+
&.license { // license message in view\adminhtml\checker\reminder.phtml
32+
font-size: 20px;
33+
line-height: 1.2;
34+
margin: 20px auto;
35+
max-width: 1300px;
36+
min-width: 960px;
37+
padding: 0 20px;
38+
}
39+
}
40+
41+
.message {
42+
position: relative;
43+
background: @alert__bg-color;
44+
color: @alert__color;
45+
padding: 1.8rem 4rem 1.8rem 1.9rem;
46+
margin-bottom: 3.5rem;
47+
text-shadow: none;
48+
49+
&:before {
50+
position: absolute;
51+
left: 1.9rem;
52+
top: 50%;
53+
margin-top: -1.3rem;
54+
background: none;
55+
text-shadow: none;
56+
width: auto;
57+
height: auto;
58+
border: 0;
59+
font-family: @icon-font-admin-name;
60+
font-size: @alert__font-size;
61+
font-style: normal;
62+
font-weight: normal;
63+
line-height: inherit;
64+
speak: none;
65+
-webkit-font-smoothing: antialiased;
66+
67+
}
68+
&-info,
69+
&.info {
70+
padding-left: 5rem;
71+
&:before {
72+
content: "\e61a";
73+
color: @alert-icon__info__color;
74+
}
75+
}
76+
&-error,
77+
&.error {
78+
padding-left: 5rem;
79+
&:before {
80+
content: '\e623';
81+
color: @alert-icon__error__color;
82+
}
83+
}
84+
&.success {
85+
padding-left: 5rem;
86+
&:before {
87+
content: '\e62d';
88+
color: @alert-icon__success__color;
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+
position: relative;
112+
min-width: 960px;
113+
max-width: 1300px;
114+
margin: 0 auto;
115+
&:before {
116+
background: none;
117+
border: 0;
118+
content: '\e006'; /* notification icon */
119+
color: #6e685e;
120+
font-family: 'MUI-Icons';
121+
font-style: normal;
122+
font-weight: normal;
123+
speak: none;
124+
-webkit-font-smoothing: antialiased;
125+
height: auto;
126+
left: 8px;
127+
margin-top: -10px;
128+
position: absolute;
129+
text-shadow: none;
130+
top: 50%;
131+
width: auto;
132+
font-size: 16px;
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+
padding: 0;
147+
border: 0;
148+
box-shadow: 0 1px 2px #46433d;
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+
position: relative;
162+
background: none;
163+
text-shadow: none;
164+
width: auto;
165+
height: auto;
166+
vertical-align: middle;
167+
border: 0;
168+
font-family: 'MUI-Icons';
169+
font-style: normal;
170+
font-weight: normal;
171+
font-size: 32px;
172+
speak: none;
173+
-webkit-font-smoothing: antialiased;
174+
content: '\e006'; /* notification icon */
175+
color: #6e685e;
176+
}
177+
}
178+
}
179+
180+
.message-demo-mode {
181+
background: #d75f07;
182+
border: 0;
183+
color: #fff;
184+
text-align: center;
185+
padding: 5px 0;
186+
box-shadow: 0 1px 2px #46433d;
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+
position: relative;
199+
background: none;
200+
text-shadow: none;
201+
width: auto;
202+
height: auto;
203+
vertical-align: middle;
204+
border: 0;
205+
font-family: 'MUI-Icons';
206+
font-style: normal;
207+
speak: none;
208+
font-weight: normal;
209+
-webkit-font-smoothing: antialiased;
210+
font-size: 16px;
211+
content: '\e006'; /* notification icon */
212+
}
213+
}
214+
}

0 commit comments

Comments
 (0)