diff options
| author | Mark Otto <[email protected]> | 2014-03-16 19:06:17 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-16 19:06:17 -0700 |
| commit | b7ab7998248696392d3d4c4b1335ef2b6b10d29f (patch) | |
| tree | e23b555f45dd706a9fd3433681fc0c9b0b56193f /dist/css/bootstrap.css | |
| parent | 2a43e7e78a59c70e217383c12c9ef0482cabb163 (diff) | |
| parent | c6ab3fc7d84450232f3024207015743ecdd929a4 (diff) | |
| download | bootstrap-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 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 132bffa62..4a7a28fb0 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -5355,6 +5355,13 @@ button.close { .modal-footer .btn-block + .btn-block { margin-left: 0; } +.modal-scrollbar-measure { + position: absolute; + top: -9999px; + width: 50px; + height: 50px; + overflow: scroll; +} @media (min-width: 768px) { .modal-dialog { width: 600px; |