Commit 5c4c7eba authored by Mark Otto's avatar Mark Otto

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

Conflicts:
	dist/css/bootstrap.min.css
parents 532e4bab a40568a1
...@@ -6205,11 +6205,20 @@ body.modal-open, ...@@ -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;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -103,11 +103,18 @@ ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment