From c04d60b88f7d8dd3700df60cd4517459b6bc82f3 Mon Sep 17 00:00:00 2001
From: Joshua David <Joshua.David@iress.com.au>
Date: Fri, 22 Jun 2018 14:13:44 +1000
Subject: [PATCH] Fix modal overflow style nesting (#26742)
Nest `.modal` styling directly under `.modal-open`
to avoid issues when bootstrap is nested.
---
scss/_modal.scss | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scss/_modal.scss b/scss/_modal.scss
index fea8112371..376c975139 100644
--- a/scss/_modal.scss
+++ b/scss/_modal.scss
@@ -4,9 +4,14 @@
// .modal-content - actual modal w/ bg and corners and stuff
-// Kill the scroll on the body
.modal-open {
+ // Kill the scroll on the body
overflow: hidden;
+
+ .modal {
+ overflow-x: hidden;
+ overflow-y: auto;
+ }
}
// Container that the modal scrolls within
@@ -25,11 +30,6 @@
// We deliberately don't use `-webkit-overflow-scrolling: touch;` due to a
// gnarly iOS Safari bug: https://bugs.webkit.org/show_bug.cgi?id=158342
// See also https://github.com/twbs/bootstrap/issues/17695
-
- .modal-open & {
- overflow-x: hidden;
- overflow-y: auto;
- }
}
// Shell div to position the modal with bottom padding
--
GitLab