Skip to content

Commit 0aa6b00

Browse files
author
Bogdan Plieshka
committed
MAGETWO-37594: Implementation and fixes after review
- Added inner scroll support option for dialog slide
1 parent b2df7b3 commit 0aa6b00

File tree

5 files changed

+29
-10
lines changed

5 files changed

+29
-10
lines changed

app/code/Magento/Ui/view/base/web/templates/dialog/dialog-modal.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
<section
99
class="dialog-<%= data.type %> <%= data.dialogClass %>
10-
<% if(data.responsive){ %><%= data.responsiveClass %><% } %>
11-
<% if(data.innerScroll){ %><%= data.innerScrollClass %><% } %>"
10+
<% if(data.responsive){ %><%= data.responsiveClass %><% } %>
11+
<% if(data.innerScroll){ %><%= data.innerScrollClass %><% } %>"
1212
data-role="dialog"
1313
data-type="<%= data.type %>">
1414
<div class="dialog-inner-wrap">

app/code/Magento/Ui/view/base/web/templates/dialog/dialog-slide.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
type="button">
2222
<span>$t('Close')</span>
2323
</button>
24-
</header>
25-
<div
26-
class="dialog-content"
27-
data-role="content">
2824
<div class="page-main-actions">
2925
<div class="page-actions">
3026
<div class="page-actions-buttons">
@@ -38,6 +34,7 @@
3834
</div>
3935
</div>
4036
</div>
41-
</div>
37+
</header>
38+
<div class="dialog-content" data-role="content"></div>
4239
</div>
4340
</section>

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@page-main-actions__background-color: @color-white-fog;
2222
@page-main-actions__border-color: @color-gray89;
23-
@page-main-actions__padding-side: @content__indent / 2;
23+
@page-main-actions__padding: @content__indent / 2;
2424

2525
//
2626

@@ -30,7 +30,7 @@
3030
background: @page-main-actions__background-color;
3131
border-bottom: 1px solid @page-main-actions__border-color;
3232
border-top: 1px solid @page-main-actions__border-color;
33-
padding: @page-main-actions__padding-side;
33+
padding: @page-main-actions__padding;
3434
}
3535

3636
.page-main-actions {

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
@@ -74,6 +74,10 @@
7474
padding-right: @dialog-slide__padding + (@dialog-action-close__font-size - @dialog-action-close__active__font-size) / 2;
7575
}
7676
}
77+
.page-main-actions {
78+
margin-top: @dialog-slide-header__padding-vertical;
79+
margin-bottom: @dialog-slide-header__padding-vertical - @page-main-actions__padding;
80+
}
7781
}
7882

7983
.dialog-title {

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,24 @@
113113

114114
.dialog-slide {
115115
.abs-dialog-slide();
116+
&._inner-scroll {
117+
.dialog-inner-wrap {
118+
.vendor-prefix-display(flex);
119+
.vendor-prefix-flex-direction(column);
120+
overflow-y: visible;
121+
}
122+
.dialog-header,
123+
.dialog-footer {
124+
.vendor-prefix-flex-grow(0);
125+
.vendor-prefix-flex-shrink(0);
126+
}
127+
.dialog-content {
128+
overflow-y: auto;
129+
}
130+
.dialog-footer {
131+
margin-top: auto;
132+
}
133+
}
116134
.dialog-header,
117135
.dialog-content,
118136
.dialog-footer {
@@ -128,7 +146,7 @@
128146
.abs-dialog-modal();
129147
// If applied, switching outer modal scroll to inner
130148
&._inner-scroll {
131-
overflow-y: inherit;
149+
overflow-y: visible;
132150
.dialog-inner-wrap {
133151
max-height: 90%;
134152
}

0 commit comments

Comments
 (0)