0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

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

This commit is contained in:
Mark Otto 2013-07-26 23:04:12 -07:00
commit 40d398bcd0
5 changed files with 5 additions and 3 deletions

View File

@ -4272,6 +4272,7 @@ a.list-group-item.active > .badge,
height: 20px;
margin-top: -10px;
margin-left: -10px;
font-family: serif;
}
.carousel-control .icon-prev:before {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -905,7 +905,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
</div>
<h2 id="popovers-examples">Examples</h2>
<p>Add small overlays of content, like those on the iPad, to any element for housing secondary information. Hover over the button to trigger the popover.</p>
<p>Add small overlays of content, like those on the iPad, to any element for housing secondary information.</p>
<div class="bs-callout bs-callout-danger">
<h4>Plugin dependency</h4>

View File

@ -111,6 +111,7 @@
height: 20px;
margin-top: -10px;
margin-left: -10px;
font-family: serif;
}
// Non-glyphicon toggles
.icon-prev {