Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua David <Joshua.David@iress.com.au>2018-06-22 07:13:44 +0300
committerMark Otto <otto@github.com>2018-07-21 02:55:16 +0300
commitc04d60b88f7d8dd3700df60cd4517459b6bc82f3 (patch)
tree30337b772a7d483a93aa7b4788f77035db464bd7 /scss/_modal.scss
parent23e4d48e658c60db7a2fa7f69e338e0a586c90fa (diff)
Fix modal overflow style nesting (#26742)
Nest `.modal` styling directly under `.modal-open` to avoid issues when bootstrap is nested.
Diffstat (limited to 'scss/_modal.scss')
-rw-r--r--scss/_modal.scss12
1 files 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