1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 17:14:04 +02:00

Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-09-06 09:23:49 -07:00
3 changed files with 19 additions and 3 deletions

View File

@@ -6205,11 +6205,20 @@ body.modal-open,
.carousel-control .glyphicon-chevron-right { .carousel-control .glyphicon-chevron-right {
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%;
z-index: 5; z-index: 5;
display: inline-block; display: inline-block;
} }
.carousel-control .icon-prev,
.carousel-control .glyphicon-chevron-left {
left: 50%;
}
.carousel-control .icon-next,
.carousel-control .glyphicon-chevron-right {
right: 50%;
}
.carousel-control .icon-prev, .carousel-control .icon-prev,
.carousel-control .icon-next { .carousel-control .icon-next {
width: 20px; width: 20px;

File diff suppressed because one or more lines are too long

View File

@@ -103,11 +103,18 @@
.glyphicon-chevron-right { .glyphicon-chevron-right {
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%;
z-index: 5; z-index: 5;
display: inline-block; display: inline-block;
} }
.icon-prev, .icon-prev,
.glyphicon-chevron-left {
left: 50%;
}
.icon-next,
.glyphicon-chevron-right {
right: 50%;
}
.icon-prev,
.icon-next { .icon-next {
width: 20px; width: 20px;
height: 20px; height: 20px;