Skip to content

Commit ba525dc

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-38407' into PR
2 parents d9639d1 + 4f8bbab commit ba525dc

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
// ---------------------------------------------
5353

5454
.menu-wrapper {
55-
float: left;
55+
display: inline-block;
5656
position: relative;
5757
width: @menu__width;
5858
z-index: @menu__z-index;
@@ -205,7 +205,7 @@
205205
min-height: ~'calc(@{menu-logo__outer-size} + 2rem + 100%)';
206206
padding: @submenu__padding-vertical 0 0;
207207
position: absolute;
208-
top: -@menu-logo__outer-size;
208+
top: 0;
209209
transform: translateX(-100%);
210210
transition-property: transform, visibility;
211211
transition-duration: .3s;

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_login.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
background-color: @login-box__background-color;
3636
border: @login-box__border;
3737
box-shadow: @login-box__shadow;
38+
display: block;
3839
float: none;
3940
margin: auto;
4041
max-width: @login-box__max-width;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ body {
3838

3939
.page-wrapper {
4040
background-color: @page-wrapper__background-color;
41-
float: left;
41+
display: inline-block;
42+
margin-left: -4px; // Clear inline-block gap
43+
vertical-align: top;
4244
width: ~'calc(100% - @{menu__width})';
4345
}
4446

0 commit comments

Comments
 (0)