mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Mark Otto
2013-07-26 23:04:12 -07:00
parent c8883647ae d0cafdd3a8
commit 40d398bcd0
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+1
View File
@@ -4272,6 +4272,7 @@ a.list-group-item.active > .badge,
height: 20px; height: 20px;
margin-top: -10px; margin-top: -10px;
margin-left: -10px; margin-left: -10px;
font-family: serif;
} }
.carousel-control .icon-prev:before { .carousel-control .icon-prev:before {
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/js/bootstrap.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
javascript.html
+1 -1
View File
@@ -905,7 +905,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
</div> </div>
<h2 id="popovers-examples">Examples</h2> <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"> <div class="bs-callout bs-callout-danger">
<h4>Plugin dependency</h4> <h4>Plugin dependency</h4>
less/carousel.less
+1
View File
@@ -111,6 +111,7 @@
height: 20px; height: 20px;
margin-top: -10px; margin-top: -10px;
margin-left: -10px; margin-left: -10px;
font-family: serif;
} }
// Non-glyphicon toggles // Non-glyphicon toggles
.icon-prev { .icon-prev {