mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	bootstrap.css
	docs/javascript.html
This commit is contained in:
Mark Otto
2011-12-21 18:39:02 -06:00
parent 12a0d69454 a5a98a8a98
commit 9fb380151d
32 changed files with 9848 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/popovers.less
+5 -1
View File
@@ -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;
lib/twipsy.less
+5 -3
View File
@@ -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(); }