Skip to content

Commit f60b39f

Browse files
author
Bogdan Plieshka
committed
MAGETWO-34789: [UI] Upgrade Magento Application
- CR changes
1 parent 52d48c9 commit f60b39f

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_utilities.less

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
// */
55

66
@import 'utilities/_vendor-prefixes.less';
7-
//@import 'utilities/_grid-framework.less';
8-
//@import 'utilities/_grid.less';
97
@import 'utilities/_animations.less';
108
@import 'utilities/_spinner.less';
119

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
bottom: 0;
3939
left: 0;
4040
min-width: 0;
41+
pointer-events: none;
4142
position: fixed;
4243
right: 0;
4344
top: 0;
4445
visibility: hidden;
45-
pointer-events: none;
4646
&._show {
4747
visibility: visible;
4848
.modal-inner-wrap {
4949
-webkit-transform: translate(0, 0);
50-
transform: translate(0, 0);
50+
transform: translate(0, 0);
5151
}
5252
}
5353
.modal-inner-wrap {
@@ -64,19 +64,19 @@
6464
&._show {
6565
.modal-inner-wrap {
6666
-webkit-transform: translateX(0);
67-
transform: translateX(0);
67+
transform: translateX(0);
6868
}
6969
}
7070
.modal-inner-wrap {
7171
height: 100%;
7272
overflow-y: auto;
7373
position: static;
7474
-webkit-transform: translateX(100%);
75-
transform: translateX(100%);
75+
transform: translateX(100%);
7676
transition-duration: .3s;
77-
transition-timing-function: ease-in-out;
7877
-webkit-transition-property: -webkit-transform, visibility;
79-
transition-property: transform, visibility;
78+
transition-property: transform, visibility;
79+
transition-timing-function: ease-in-out;
8080
width: auto;
8181
}
8282
}
@@ -88,24 +88,24 @@
8888
&._show {
8989
.modal-inner-wrap {
9090
-webkit-transform: translateY(0);
91-
transform: translateY(0);
91+
transform: translateY(0);
9292
}
9393
}
9494
.modal-inner-wrap {
9595
box-sizing: border-box;
96-
.vendor-prefix-display(flex);
97-
.vendor-prefix-flex-direction(column);
9896
height: auto;
9997
left: 0;
100-
right: 0;
10198
margin: @modal-popup__indent-vertical auto;
10299
position: absolute;
100+
right: 0;
103101
-webkit-transform: translateY(-200%);
104-
transform: translateY(-200%);
102+
transform: translateY(-200%);
105103
transition-duration: .2s;
106-
transition-timing-function: ease;
107104
-webkit-transition-property: -webkit-transform, visibility;
108-
transition-property: transform, visibility;
105+
transition-property: transform, visibility;
106+
transition-timing-function: ease;
107+
.vendor-prefix-display(flex);
108+
.vendor-prefix-flex-direction(column);
109109
width: @modal-popup__width;
110110
}
111111
}
@@ -136,9 +136,9 @@ body {
136136
.abs-modal-slide();
137137
&._inner-scroll {
138138
.modal-inner-wrap {
139+
overflow-y: visible;
139140
.vendor-prefix-display(flex);
140141
.vendor-prefix-flex-direction(column);
141-
overflow-y: visible;
142142
}
143143
.modal-header,
144144
.modal-footer {
@@ -158,8 +158,8 @@ body {
158158
padding: 0 @modal-slide__padding @modal-slide__padding;
159159
}
160160
.modal-header {
161-
padding-top: @modal-slide-header__padding-vertical;
162161
padding-bottom: @modal-slide-header__padding-vertical;
162+
padding-top: @modal-slide-header__padding-vertical;
163163
}
164164
}
165165

@@ -195,21 +195,21 @@ body {
195195
.vendor-prefix-flex-shrink(0);
196196
}
197197
.modal-header {
198-
padding-top: @modal-popup__padding;
199198
padding-bottom: @modal-popup__padding;
199+
padding-top: @modal-popup__padding;
200200
}
201201
.modal-footer {
202202
margin-top: auto;
203-
padding-top: @modal-popup__padding;
204203
padding-bottom: @modal-popup__padding;
204+
padding-top: @modal-popup__padding;
205205
}
206206
.modal-footer-actions {
207207
text-align: right;
208208
}
209209
&.confirm {
210210
.modal-inner-wrap {
211-
margin-left: -(@modal-popup-confirm__width/2);
212211
left: 50%;
212+
margin-left: -(@modal-popup-confirm__width/2);
213213
width: @modal-popup-confirm__width;
214214
}
215215
.modal-footer {

0 commit comments

Comments
 (0)