github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-01-21 04:17:53 -05:00
Code Issues Packages Projects Releases Wiki 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

1
dist/css/bootstrap.css vendored
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 {

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
javascript.html
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>

1
less/carousel.less
View File

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