diff options
| author | Mark Otto <[email protected]> | 2012-01-28 12:43:45 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-28 12:43:45 -0800 |
| commit | 698d4b414c234f74ae93384a8d83c14c15ab2cc9 (patch) | |
| tree | cc4e20b82963c0e51c2df122d24eaa9afee33aae /docs/assets | |
| parent | 2bfda031cebcde7361797dd54badeb91d4cb98cf (diff) | |
| parent | f768242759903151c9957a493c5349f931d882ef (diff) | |
| download | bootstrap-698d4b414c234f74ae93384a8d83c14c15ab2cc9.tar.xz bootstrap-698d4b414c234f74ae93384a8d83c14c15ab2cc9.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 12 | ||||
| -rw-r--r-- | docs/assets/js/application.js | 9 |
2 files changed, 14 insertions, 7 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b6fe4d492..f69943c67 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2235,6 +2235,18 @@ table .span12 { .pager .previous a { float: left; } +.modal-open .dropdown-menu { + z-index: 2050; +} +.modal-open .dropdown.open { + *z-index: 2050; +} +.modal-open .popover { + z-index: 2060; +} +.modal-open .tooltip { + z-index: 2070; +} .modal-backdrop { position: fixed; top: 0; diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 8fd672bb3..585700f8e 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -69,13 +69,8 @@ selector: "a[rel=tooltip]" }) - $('.tooltip-test').tooltip({ - 'z-index': 3000 - }) - - $('.popover-test').popover({ - 'z-index': 3000 - }) + $('.tooltip-test').tooltip() + $('.popover-test').popover() // popover demo $("a[rel=popover]") |