diff options
| author | Mark Otto <[email protected]> | 2012-01-11 21:59:33 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-11 21:59:33 -0800 |
| commit | 620d987f9f4a6e5d7bcf270159aea10e01d32a35 (patch) | |
| tree | ba4f28d0061aed2585591ed4455fd58169e2adfc /lib/variables.less | |
| parent | 32c628725924ca014df208fa57de4c5a4050733e (diff) | |
| parent | 19090ea33322e9d4309497f838f8627ca21734bf (diff) | |
| download | bootstrap-620d987f9f4a6e5d7bcf270159aea10e01d32a35.tar.xz bootstrap-620d987f9f4a6e5d7bcf270159aea10e01d32a35.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'lib/variables.less')
| -rw-r--r-- | lib/variables.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/variables.less b/lib/variables.less index 97b6f9e3c..3f32c36f4 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -52,7 +52,7 @@ @zindexDropdown: 1000; @zindexPopover: 1010; -@zindexTwipsy: 1020; +@zindexTooltip: 1020; @zindexFixedNavbar: 1030; @zindexModalBackdrop: 1040; @zindexModal: 1050; |