Skip to content

Commit d769395

Browse files
author
Bogdan Plieshka
committed
MAGETWO-37594: Implementation and fixes after review
- Clean up dialog styles - Fixed few visual issues for action-close and footer alignment
1 parent 138bc3b commit d769395

File tree

2 files changed

+41
-17
lines changed

2 files changed

+41
-17
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
position: absolute;
3131
right: 0;
3232
top: 0;
33+
&:active {
34+
transform: none;
35+
margin-top: 1px;
36+
}
3337
&:hover {
3438
&:before {
3539
color: @dialog-action-close__hover__color;

lib/web/css/source/components/_dialogs.less

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,24 @@
5353
opacity: 1;
5454
pointer-events: auto;
5555
}
56-
&._active {
57-
z-index: @dialog__z-index + 1;
58-
}
5956
}
6057

6158
.abs-dialog-slide() {
6259
left: @dialog-slide__first__indent-left;
6360
z-index: @dialog-slide__z-index;
61+
&._show {
62+
.dialog-inner-wrap {
63+
transform: translateX(0);
64+
}
65+
}
6466
.dialog-inner-wrap {
6567
height: 100%;
6668
overflow-y: auto;
6769
position: static;
68-
transform: translate(100%, 0);
69-
transition: transform .5s ease, visibility 1s linear;
70+
transform: translateX(100%);
71+
transition-duration: .3s;
72+
transition-timing-function: ease-in-out;
73+
transition-property: transform, visibility;
7074
width: auto;
7175
}
7276
}
@@ -75,14 +79,21 @@
7579
left: 0;
7680
overflow-y: auto;
7781
z-index: @dialog-modal__z-index;
82+
&._show {
83+
.dialog-inner-wrap {
84+
transform: translateY(0);
85+
}
86+
}
7887
.dialog-inner-wrap {
7988
.vendor-prefix-display(flex);
8089
.vendor-prefix-flex-direction(column);
8190
height: auto;
8291
margin: @dialog-modal__indent-vertical (100% - @dialog-modal__width) / 2;
8392
position: absolute;
84-
transform: translate(0, -150%);
85-
transition: transform .3s linear, visibility 1s linear;
93+
transform: translateY(-200%);
94+
transition-duration: .2s;
95+
transition-timing-function: ease;
96+
transition-property: transform, visibility;
8697
width: @dialog-modal__width;
8798
}
8899
}
@@ -111,23 +122,25 @@
111122
padding-top: @dialog-slide-header__padding-vertical;
112123
padding-bottom: @dialog-slide-header__padding-vertical;
113124
}
114-
+ .dialog-slide {
115-
margin-left: @dialog-slide__indent-left;
116-
+ .dialog-slide {
117-
margin-left: @dialog-slide__indent-left * 2;
118-
+ .dialog-slide {
119-
margin-left: @dialog-slide__indent-left * 3;
120-
}
121-
}
122-
}
123125
}
124126

125127
.dialog-modal {
126128
.abs-dialog-modal();
129+
// If applied, switching outer modal scroll to inner
130+
&._inner-scroll {
131+
overflow-y: inherit;
132+
.dialog-inner-wrap {
133+
max-height: 90%;
134+
}
135+
.dialog-content {
136+
overflow-y: auto;
137+
}
138+
}
127139
.dialog-header,
128140
.dialog-content,
129141
.dialog-footer {
130-
padding: 0 @dialog-modal__padding @dialog-modal__padding;
142+
padding-left: @dialog-modal__padding;
143+
padding-right: @dialog-modal__padding;
131144
}
132145
.dialog-header,
133146
.dialog-footer {
@@ -136,9 +149,12 @@
136149
}
137150
.dialog-header {
138151
padding-top: @dialog-modal__padding;
152+
padding-bottom: @dialog-modal__padding;
139153
}
140154
.dialog-footer {
141155
margin-top: auto;
156+
padding-top: @dialog-modal__padding;
157+
padding-bottom: @dialog-modal__padding;
142158
}
143159
}
144160

@@ -151,6 +167,10 @@
151167
.dialog-modal {
152168
&.dialog-slide {
153169
.abs-dialog-slide();
170+
.dialog-inner-wrap {
171+
margin: 0;
172+
max-height: none;
173+
}
154174
}
155175
}
156176
}

0 commit comments

Comments
 (0)