Skip to content

Commit 4a8c027

Browse files
zanileezanilee
committed
MAGETWO-34984: Invert new admin styles scope
1 parent 4be090f commit 4a8c027

File tree

4 files changed

+33
-104
lines changed

4 files changed

+33
-104
lines changed

‎app/code/Magento/Theme/view/adminhtml/page_layout/admin-1column.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@
3434
<container name="page.messages" as="page.messages"/>
3535
</container>
3636
</container>
37-
<container name="page.main.container" as="page_main_container" htmlId="page:main-container" htmlTag="div" htmlClass="page-columns admin__scope-old">
38-
<container name="main.col" as="main-col" htmlId="container" htmlTag="div" htmlClass="main-col">
39-
<container name="content" as="content"/>
37+
<container name="page.main.container" as="page_main_container" htmlId="page:main-container" htmlTag="div" htmlClass="page-columns">
38+
<container name="admin.scope.col.wrap" as="admin-scope-col-wrap" htmlTag="div" htmlClass="admin__scope-old"> <!-- ToDo UI: remove this wrapper remove with old styles removal -->
39+
<container name="main.col" as="main-col" htmlId="container" htmlTag="div" htmlClass="main-col">
40+
<container name="content" as="content"/>
41+
</container>
4042
</container>
4143
</container>
4244
</container>

‎app/code/Magento/Theme/view/adminhtml/page_layout/admin-2columns-left.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@
3535
</container>
3636
</container>
3737
<container name="page.main.container" as="page_main_container" htmlId="page:main-container" htmlTag="div" htmlClass="page-columns row admin__scope-old">
38-
<!-- ToDo UI: remove main-col & side-col class after new sidebar implemented -->
38+
<!-- ToDo UI: remove 'main-col' & 'side-col' class names after new sidebar implemented -->
3939
<container name="main.col" as="main-col" htmlId="container" htmlTag="div" htmlClass="main-col col-m-9 col-m-push-3">
40-
<container name="content" as="content"/>
40+
<container name="admin.scope.col.wrap" as="admin-scope-col-wrap" htmlTag="div" htmlClass="admin__scope-old"> <!-- ToDo UI: remove this wrapper remove with old styles removal -->
41+
<container name="content" as="content"/>
42+
</container>
4143
</container>
4244
<container name="side.col" as="side-col" after="main.col" htmlId="page:left" htmlTag="div" htmlClass="col-m-3 col-m-pull-9 side-col">
4345
<container name="left" as="left"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<css src="css/styles.css"/>
1616
</head>
1717
<body>
18-
<referenceContainer name="page.main.container" htmlClass="page-columns" />
18+
<referenceContainer name="admin.scope.col.wrap" htmlClass="" /> <!-- ToDo UI: remove this wrapper remove with old styles removal -->
1919
</body>
2020
</page>

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

Lines changed: 23 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -5,65 +5,6 @@
55

66
// @group Header
77

8-
9-
// Base
10-
//
11-
//html {
12-
// font-size: 62.5%;
13-
// -webkit-text-size-adjust: 100%;
14-
// -ms-text-size-adjust: 100%;
15-
// font-size-adjust: 100%;
16-
//}
17-
//
18-
//body,
19-
//html {
20-
// height: 100%;
21-
// min-height: 100%;
22-
//}
23-
//
24-
//body {
25-
// color: @baseColor;
26-
// font-family: @baseFont;
27-
// line-height: @baseLineHeight;
28-
// font-weight: @baseFontWeight;
29-
// .font-size(@baseFontSize);
30-
// background: #f5f5f5;
31-
// .vendor-prefix-display(flex);
32-
// .vendor-prefix-flex-direction(column);
33-
// & > * {
34-
// .vendor-prefix-flex-grow(0);
35-
// .vendor-prefix-flex-shrink(0);
36-
// .vendor-prefix-flex-basis(auto);
37-
// }
38-
//}
39-
//
40-
//.page-wrapper {
41-
// max-width: 100%;
42-
// min-width: @layout__min-width + 2 * @layout-indent__width;
43-
// margin-left: 8.8rem; // migration styles -> @menu__width
44-
// background-color: #fff;
45-
// box-sizing: border-box;
46-
//}
47-
//
48-
//.page-actions {
49-
// &.fixed &-inner {
50-
// &:extend(._layout-width all);
51-
// }
52-
// &.fixed &-buttons {
53-
// padding-right: 15px;
54-
// }
55-
//}
56-
//
57-
//.page-content {
58-
// &:extend(._layout-width all);
59-
// .clearer();
60-
// min-height: 20rem; // ToDo UI: delete if sticky footer
61-
//}
62-
//
63-
//.page-wrapper > .page-content {
64-
// margin-bottom: 20px;
65-
//}
66-
//
678
button {
689
border-radius: 2px;
6910
.button();
@@ -72,46 +13,30 @@ button {
7213
}
7314
}
7415

75-
//.actions-split {
76-
// button {
77-
// margin-left: 0 !important;
78-
// }
79-
// .dropdown-split(
80-
// @_toggle-selector: ~".action-toggle",
81-
// @_button-selector: ~".action-default",
82-
// @_options-selector : ~".dropdown-menu",
83-
// @_dropdown-split-button-border-radius-fix: true,
84-
// @_dropdown-split-list-min-width: 175px
85-
// );
86-
// vertical-align: middle;
87-
// .action-toggle:after {
88-
// height: 13px;
89-
// }
90-
//}
16+
.main-col {
17+
min-height: 20rem; // ToDo UI: delete if sticky footer
18+
}
9119

9220
//
93-
// Icons
94-
//--------------------------------------
95-
.icon-error {
96-
margin-left: 15px;
97-
color: #c00815;
98-
font-size: 11px;
99-
&:before {
100-
font-family: 'MUI-Icons';
101-
content: "\e086";
102-
font-size: 13px;
103-
line-height: 13px;
104-
overflow: hidden;
105-
speak: none;
106-
font-weight: normal;
107-
-webkit-font-smoothing: antialiased;
108-
display: inline-block;
109-
vertical-align: middle;
110-
text-align: center;
111-
margin: -1px 5px 0 0;
112-
}
113-
}
21+
// Icons
22+
// ---------------------------------------------
11423

115-
.ui-widget-overlay {
116-
position: fixed;
24+
.icon-error {
25+
margin-left: 15px;
26+
color: #c00815;
27+
font-size: 11px;
28+
&:before {
29+
font-family: 'MUI-Icons';
30+
content: "\e086";
31+
font-size: 13px;
32+
line-height: 13px;
33+
overflow: hidden;
34+
speak: none;
35+
font-weight: normal;
36+
-webkit-font-smoothing: antialiased;
37+
display: inline-block;
38+
vertical-align: middle;
39+
text-align: center;
40+
margin: -1px 5px 0 0;
41+
}
11742
}

0 commit comments

Comments
 (0)