github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2012-01-11 21:59:33 -08:00
parent 32c6287259 19090ea333
commit 620d987f9f
17 changed files with 296 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bootstrap.css vendored
View File

@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Wed Jan 11 09:43:04 PST 2012
* Date: Wed Jan 11 21:59:22 PST 2012
*/
html, body {
margin: 0;
@@ -2214,7 +2214,7 @@ i {
float: right;
margin-left: 5px;
}
.twipsy {
.tooltip {
position: absolute;
z-index: 1020;
display: block;
@@ -2225,24 +2225,24 @@ i {
-moz-opacity: 0;
opacity: 0;
}
.twipsy.in {
.tooltip.in {
filter: alpha(opacity=80);
-moz-opacity: 0.8;
opacity: 0.8;
}
.twipsy.top {
.tooltip.top {
margin-top: -2px;
}
.twipsy.right {
.tooltip.right {
margin-left: 2px;
}
.twipsy.bottom {
.tooltip.bottom {
margin-top: 2px;
}
.twipsy.left {
.tooltip.left {
margin-left: -2px;
}
.twipsy.top .twipsy-arrow {
.tooltip.top .tooltip-arrow {
bottom: 0;
left: 50%;
margin-left: -5px;
@@ -2250,7 +2250,7 @@ i {
border-right: 5px solid transparent;
border-top: 5px solid #000000;
}
.twipsy.left .twipsy-arrow {
.tooltip.left .tooltip-arrow {
top: 50%;
right: 0;
margin-top: -5px;
@@ -2258,7 +2258,7 @@ i {
border-bottom: 5px solid transparent;
border-left: 5px solid #000000;
}
.twipsy.bottom .twipsy-arrow {
.tooltip.bottom .tooltip-arrow {
top: 0;
left: 50%;
margin-left: -5px;
@@ -2266,7 +2266,7 @@ i {
border-right: 5px solid transparent;
border-bottom: 5px solid #000000;
}
.twipsy.right .twipsy-arrow {
.tooltip.right .tooltip-arrow {
top: 50%;
left: 0;
margin-top: -5px;
@@ -2274,7 +2274,7 @@ i {
border-bottom: 5px solid transparent;
border-right: 5px solid #000000;
}
.twipsy-inner {
.tooltip-inner {
max-width: 200px;
padding: 3px 8px;
color: white;
@@ -2285,7 +2285,7 @@ i {
-moz-border-radius: 4px;
border-radius: 4px;
}
.twipsy-arrow {
.tooltip-arrow {
position: absolute;
width: 0;
height: 0;
@@ -2625,6 +2625,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-moz-border-radius: 5px;
border-radius: 5px;
}
.btn-group.open .dropdown-menu.large {
top: 40px;
}
.btn-group.open .dropdown-toggle {
background-image: none;
-webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);