kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

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

Browse source
This commit is contained in:
Mark Otto 2013-07-18 00:43:48 -07:00
commit 1363ffa473
3 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
docs/assets/css/bootstrap.css vendored
View file

@ -4390,7 +4390,9 @@ a.list-group-item.active > .badge,
filter: alpha(opacity=90);
}
.carousel-control .glyphicon {
.carousel-control .glyphicon,
.carousel-control .icon-prev,
.carousel-control .icon-next {
position: absolute;
top: 50%;
left: 50%;
@ -4402,6 +4404,14 @@ a.list-group-item.active > .badge,
margin-left: -10px;
}
.carousel-control .icon-prev:before {
content: '\00ab';
}
.carousel-control .icon-next:before {
content: '\00bb';
}
.carousel-indicators {
position: absolute;
bottom: 20px;
@ -4450,7 +4460,9 @@ a.list-group-item.active > .badge,
}
@media screen and (min-width: 768px) {
.carousel-control .glyphicon {
.carousel-control .glyphicon,
.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 30px;
height: 30px;
margin-top: -15px;

16
docs/javascript.html
View file

@ -1518,10 +1518,10 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
</div>
</div>
<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
<span class="icon-next"></span>
</a>
</div>
</div><!-- /example -->
@ -1547,13 +1547,17 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
<span class="icon-next"></span>
</a>
</div>
{% endhighlight %}
<div class="bs-callout">
<h4>Glyphicon Alternative</h4>
<p>With <a href="/css/#glyphicons">Glyphicons</a> available, you may choose to style the left and right toggle buttons with <code>.glyphicon-chevron-left</code> and <code>.glyphicon-chevron-right</code>.</p>
</div>
<h3>Optional captions</h3>
<p>Add captions to your slides easily with the <code>.carousel-caption</code> element within any <code>.item</code>. Place just about any optional HTML within there and it will be automatically aligned and formatted.</p>
@ -1592,10 +1596,10 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
</div>
</div>
<a class="left carousel-control" href="#carousel-example-captions" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
<span class="icon-prev"></span>
</a>
<a class="right carousel-control" href="#carousel-example-captions" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
<span class="icon-next"></span>
</a>
</div>
</div><!-- /example -->

17
less/carousel.less
View file

@ -99,7 +99,7 @@
}
// Toggles
.glyphicon {
.glyphicon, .icon-prev, .icon-next {
position: absolute;
top: 50%;
left: 50%;
@ -110,6 +110,17 @@
margin-top: -10px;
margin-left: -10px;
}
// Non-glyphicon toggles
.icon-prev {
&:before {
content: '\00ab';
}
}
.icon-next {
&:before {
content: '\00bb';
}
}
}
// Optional indicator pips
@ -167,7 +178,9 @@
@media screen and (min-width: @screen-tablet) {
// Scale up the controls a smidge
.carousel-control .glyphicon {
.carousel-control .glyphicon,
.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 30px;
height: 30px;
margin-top: -15px;