Commit 40d398bc authored by Mark Otto's avatar Mark Otto

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

parents c8883647 d0cafdd3
......@@ -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 {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -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>
......
......@@ -111,6 +111,7 @@
height: 20px;
margin-top: -10px;
margin-left: -10px;
font-family: serif;
}
// Non-glyphicon toggles
.icon-prev {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment