aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMaurice Wahba <[email protected]>2013-07-06 22:20:56 +0400
committerMaurice Wahba <[email protected]>2013-07-06 22:26:40 +0400
commit8a84da6341e19011ce8f8e518d7b1cb7f0931da5 (patch)
treeb7c2809d0352fa4040bd3e8b8927fdbb6af6a009 /docs
parent95655e72754b9450d04108593f60647cf2e2241c (diff)
downloadbootstrap-8a84da6341e19011ce8f8e518d7b1cb7f0931da5.tar.xz
bootstrap-8a84da6341e19011ce8f8e518d7b1cb7f0931da5.zip
Carousel no longer dependent on glyphicons
Used laquo/raquo for control buttons Updated docs
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css16
-rw-r--r--docs/javascript.html16
2 files changed, 24 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d3bea53f3..2f6904cce 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4396,7 +4396,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%;
@@ -4408,6 +4410,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;
@@ -4456,7 +4466,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;
diff --git a/docs/javascript.html b/docs/javascript.html
index 91198bd19..0f5d37259 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1512,10 +1512,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 -->
@@ -1541,13 +1541,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>
@@ -1586,10 +1590,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 -->