Skip to content

Commit 1e94c95

Browse files
author
Bogdan Plieshka
committed
MAGETWO-37594: Implementation and fixes after review
- Added flex model to dialog modals - Foxed absent dialog title case
1 parent 9fcc789 commit 1e94c95

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
.dialog-slide {
5555
.dialog-title {
5656
font-size: @dialog-slide-title__font-size;
57-
margin-bottom: 0;
5857
margin-right: @dialog-slide-title__font-size + @dialog-slide__padding + 1rem;
5958
}
6059
.action-close {
@@ -64,4 +63,6 @@
6463

6564
.dialog-title {
6665
font-weight: @font-weight__regular;
66+
margin-bottom: 0;
67+
min-height: 1em;
6768
}

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
background-color: @dialog__background-color;
5151
box-shadow: @dialog__box-shadow;
5252
opacity: 1;
53-
overflow-y: auto;
5453
}
5554
}
5655

@@ -59,6 +58,7 @@
5958
z-index: @dialog-slide__z-index;
6059
.dialog-inner-wrap {
6160
height: 100%;
61+
overflow-y: auto;
6262
position: static;
6363
transform: translate(100%, 0);
6464
transition: transform .5s ease, visibility 1s linear;
@@ -68,8 +68,11 @@
6868

6969
.abs-dialog-modal() {
7070
left: 0;
71+
overflow-y: auto;
7172
z-index: @dialog-modal__z-index;
7273
.dialog-inner-wrap {
74+
.vendor-prefix-display(flex);
75+
.vendor-prefix-flex-direction(column);
7376
height: auto;
7477
margin: @dialog-modal__indent-vertical (100% - @dialog-modal__width) / 2;
7578
position: absolute;
@@ -121,9 +124,17 @@
121124
.dialog-footer {
122125
padding: 0 @dialog-modal__padding @dialog-modal__padding;
123126
}
127+
.dialog-header,
128+
.dialog-footer {
129+
.vendor-prefix-flex-grow(0);
130+
.vendor-prefix-flex-shrink(0);
131+
}
124132
.dialog-header {
125133
padding-top: @dialog-modal__padding;
126134
}
135+
.dialog-footer {
136+
margin-top: auto;
137+
}
127138
}
128139

129140
//

0 commit comments

Comments
 (0)