Skip to content

Commit 91c95fb

Browse files
author
Evgeniy Kolesov
committed
MAGETWO-35091: UI improvements
1 parent e920d24 commit 91c95fb

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,13 @@
3030
<container name="messages.wrapper" as="messages.wrapper" htmlTag="div" htmlId="messages">
3131
<container name="page.messages" as="page.messages"/>
3232
</container>
33-
<!-- ToDo UI: .col-gutter will be deprecated after #a0c2682 merged -->
34-
<container name="page.main.container" as="page_main_container" htmlId="page:main-container" htmlTag="div" htmlClass="page-columns row row-gutter">
35-
<!-- ToDo UI: remove 'main-col' & 'side-col' class names after new sidebar implemented -->
36-
<container name="main.col" as="main-col" htmlId="container" htmlTag="div" htmlClass="main-col col-m-9 col-m-push-3 col-gutter">
33+
<container name="page.main.container" as="page_main_container" htmlId="page:main-container" htmlTag="div" htmlClass="page-columns">
34+
<container name="main.col" as="main-col" htmlId="container" htmlTag="div" htmlClass="main-col">
3735
<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 -->
3836
<container name="content" as="content"/>
3937
</container>
4038
</container>
41-
<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 col-gutter">
39+
<container name="side.col" as="side-col" after="main.col" htmlId="page:left" htmlTag="div" htmlClass="side-col">
4240
<container name="left" as="left"/>
4341
</container>
4442
</container>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,18 @@ body {
4545
margin-bottom: 0;
4646
}
4747
}
48+
49+
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
50+
.page-layout-admin-2columns-left {
51+
.page-columns {
52+
#mix-grid .row();
53+
.main-col {
54+
#mix-grid .width(9,12);
55+
float: right;
56+
}
57+
.side-col {
58+
#mix-grid .column(3,12);
59+
}
60+
}
61+
}
62+
}

app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@
4747
}
4848

4949
// @todo ui Move to other place - will be done in upcoming task "Address Tabs":
50-
.ui-tabs {
51-
margin-bottom: 5rem;
52-
}
50+
5351
.address-item-edit-content {
5452
background: #fff;
5553
border: 1px solid #dad1c8;

dev/tools/grunt/configs/clean.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ var cleanOptions = {
8787
"src": [
8888
"<%= path.tmp %>/cache/**/*",
8989
"<%= path.tmp %>/generation/**/*",
90+
"<%= path.tmp %>/view_preprocessed/html/**/*",
9091
"<%= path.tmp %>/page_cache/**/*"
9192
]
9293
}

0 commit comments

Comments
 (0)