Merge pull request magento#2015 from magento-chaika/Chaika_2.1.13_PR3

Fixed issue: MAGETWO-64171: User can't create new address on checkout from IE11
hostep · Feb 6, 2018 · 918dd05 · 918dd05
2 parents 814c791 + 8440932
commit 918dd05
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/dev/travis/before_script.sh b/dev/travis/before_script.sh
@@ -71,7 +71,7 @@ case $TEST_SUITE in
             --output-file="$changed_files_ce" \
             --base-path="$TRAVIS_BUILD_DIR" \
             --repo='https://github.com/magento/magento2.git' \
-            --branch='2.1'
+            --branch="$TRAVIS_BRANCH"
         cat "$changed_files_ce" | sed 's/^/  + including /'
 
         cd ../../..

diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
@@ -189,13 +189,17 @@
         //  If applied, switching outer popup scroll to inner
         &._inner-scroll {
             overflow-y: visible;
+
+            .ie11 &,
             .ie10 &,
             .ie9 & {
                 overflow-y: auto;
             }
 
             .modal-inner-wrap {
                 max-height: 90%;
+
+                .ie11 &,
                 .ie10 &,
                 .ie9 & {
                     max-height: none;