aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-03-16 19:06:17 -0700
committerMark Otto <[email protected]>2014-03-16 19:06:17 -0700
commitb7ab7998248696392d3d4c4b1335ef2b6b10d29f (patch)
treee23b555f45dd706a9fd3433681fc0c9b0b56193f /less
parent2a43e7e78a59c70e217383c12c9ef0482cabb163 (diff)
parentc6ab3fc7d84450232f3024207015743ecdd929a4 (diff)
downloadbootstrap-b7ab7998248696392d3d4c4b1335ef2b6b10d29f.tar.xz
bootstrap-b7ab7998248696392d3d4c4b1335ef2b6b10d29f.zip
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts: dist/js/bootstrap.min.js docs/dist/js/bootstrap.min.js
Diffstat (limited to 'less')
-rw-r--r--less/modals.less9
1 files changed, 9 insertions, 0 deletions
diff --git a/less/modals.less b/less/modals.less
index 8438a1616..093d05131 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -118,6 +118,15 @@
}
}
+// Measure scrollbar width for padding body during modal show/hide
+.modal-scrollbar-measure {
+ position: absolute;
+ top: -9999px;
+ width: 50px;
+ height: 50px;
+ overflow: scroll;
+}
+
// Scale up the modal
@media (min-width: @screen-sm-min) {
// Automatically set modal's width for larger viewports