2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00

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

This commit is contained in:
Mark Otto
2013-07-18 00:43:48 -07:00
3 changed files with 39 additions and 10 deletions
+14 -2
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;