diff options
| author | Mark Otto <[email protected]> | 2011-12-21 18:39:02 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-12-21 18:39:02 -0600 |
| commit | 9fb380151d477f1741b7609ade7a9e7fd5450b2c (patch) | |
| tree | a749f2b6917c09770af1586ae9f83e46115de7eb /lib | |
| parent | 12a0d69454a2831031035d19237d36d38bb2c2a9 (diff) | |
| parent | a5a98a8a984512011dac1216b432b86c6eff96a4 (diff) | |
| download | bootstrap-9fb380151d477f1741b7609ade7a9e7fd5450b2c.tar.xz bootstrap-9fb380151d477f1741b7609ade7a9e7fd5450b2c.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
docs/javascript.html
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/popovers.less | 6 | ||||
| -rw-r--r-- | lib/twipsy.less | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/popovers.less b/lib/popovers.less index 570bc906c..ff875eaff 100644 --- a/lib/popovers.less +++ b/lib/popovers.less @@ -8,10 +8,14 @@ z-index: 1000; display: none; padding: 5px; + &.above { margin-top: -5px; } + &.right { margin-left: 5px; } + &.below { margin-top: 5px; } + &.left { margin-left: -5px; } &.above .arrow { #popoverArrow > .above(); } &.right .arrow { #popoverArrow > .right(); } &.below .arrow { #popoverArrow > .below(); } - &.left .arrow { #popoverArrow > .left(); } + &.left .arrow { #popoverArrow > .left(); } .arrow { position: absolute; width: 0; diff --git a/lib/twipsy.less b/lib/twipsy.less index 3fa21fa01..05f121a5d 100644 --- a/lib/twipsy.less +++ b/lib/twipsy.less @@ -9,9 +9,11 @@ padding: 5px; font-size: 11px; .opacity(0); - &.in { - .opacity(80); - } + &.in { .opacity(80); } + &.above { margin-top: -2px; } + &.right { margin-left: 2px; } + &.below { margin-top: 2px; } + &.left { margin-left: -2px; } &.above .twipsy-arrow { #popoverArrow > .above(); } &.left .twipsy-arrow { #popoverArrow > .left(); } &.below .twipsy-arrow { #popoverArrow > .below(); } |