Skip to content

Commit a8566d4

Browse files
author
Bogdan Plieshka
committed
MAGETWO-37594: Implementation and fixes after review
- Added scrollbar appearing compensation - Modified dialogs action close active state
1 parent d769395 commit a8566d4

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
// Variables
1212
// ---------------------------------------------
1313

14+
@window__min-width: 1024px;
15+
1416
@body__background-color: @color-white-smoke;
1517

1618
@page-wrapper__indent-left: @menu__width;
@@ -29,7 +31,7 @@ body {
2931

3032
.page-wrapper {
3133
background-color: @page-wrapper__background-color;
32-
min-width: 102.4rem;
34+
min-width: @window__min-width;
3335
padding-left: @page-wrapper__indent-left;
3436
}
3537

@@ -47,6 +49,14 @@ body {
4749
}
4850
}
4951

52+
// Scroll bar appearing compensation
53+
@media (min-width: @window__min-width) {
54+
html {
55+
width: 100vw;
56+
overflow-x: hidden;
57+
}
58+
}
59+
5060
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
5161
.page-layout-admin-2columns-left {
5262
.page-columns {

app/design/adminhtml/Magento/backend/web/css/source/components/_dialogs_extend.less

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
@dialog-action-close__color: @color-brownie-vanilla;
2121
@dialog-action-close__font-size: 2rem;
22+
@dialog-action-close__active__font-size: 1.8rem;
2223
@dialog-action-close__hover__color: darken(@color-brownie-vanilla, 10%);
2324

2425
//
@@ -32,7 +33,9 @@
3233
top: 0;
3334
&:active {
3435
transform: none;
35-
margin-top: 1px;
36+
&:before {
37+
font-size: @dialog-action-close__active__font-size;
38+
}
3639
}
3740
&:hover {
3841
&:before {
@@ -52,6 +55,10 @@
5255
}
5356
.action-close {
5457
padding: @dialog-modal__padding;
58+
&:active {
59+
padding-top: @dialog-modal__padding + (@dialog-action-close__font-size - @dialog-action-close__active__font-size) / 2;
60+
padding-right: @dialog-modal__padding + (@dialog-action-close__font-size - @dialog-action-close__active__font-size) / 2;
61+
}
5562
}
5663
}
5764

@@ -62,6 +69,10 @@
6269
}
6370
.action-close {
6471
padding: @dialog-slide-header__padding-vertical @dialog-slide__padding;
72+
&:active {
73+
padding-top: @dialog-slide-header__padding-vertical + (@dialog-action-close__font-size - @dialog-action-close__active__font-size) / 2;
74+
padding-right: @dialog-slide__padding + (@dialog-action-close__font-size - @dialog-action-close__active__font-size) / 2;
75+
}
6576
}
6677
}
6778

0 commit comments

Comments
 (0)