Skip to content

Commit 9b02c98

Browse files
author
Oleksandr Iegorov
committed
Merge branch '2.1-develop' of https://github.com/magento/magento2ce into 2.1.13-PR-0.1
2 parents a5069d0 + 918dd05 commit 9b02c98

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

dev/travis/before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ case $TEST_SUITE in
7171
--output-file="$changed_files_ce" \
7272
--base-path="$TRAVIS_BUILD_DIR" \
7373
--repo='https://github.com/magento/magento2.git' \
74-
--branch='2.1'
74+
--branch="$TRAVIS_BRANCH"
7575
cat "$changed_files_ce" | sed 's/^/ + including /'
7676

7777
cd ../../..

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,17 @@
189189
// If applied, switching outer popup scroll to inner
190190
&._inner-scroll {
191191
overflow-y: visible;
192+
193+
.ie11 &,
192194
.ie10 &,
193195
.ie9 & {
194196
overflow-y: auto;
195197
}
196198

197199
.modal-inner-wrap {
198200
max-height: 90%;
201+
202+
.ie11 &,
199203
.ie10 &,
200204
.ie9 & {
201205
max-height: none;

0 commit comments

Comments
 (0)