aboutsummaryrefslogtreecommitdiff
path: root/docs/examples/carousel/carousel.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-03-07 01:30:28 -0800
committerMark Otto <[email protected]>2014-03-07 01:30:28 -0800
commit0143e38a672335b7ca2d73d0de5b2a2b4618f9e9 (patch)
tree7188809b7c2194fc0aca9a65b7d07725ee4206d5 /docs/examples/carousel/carousel.css
parent642fd5100293755a6003448d4a481f3b314edf15 (diff)
parent1f148427de6d35a06e225deeee0b162b11955232 (diff)
downloadbootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.tar.xz
bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.zip
Merge branch 'master' into document_popover_focus
Conflicts: docs/assets/js/docs.min.js
Diffstat (limited to 'docs/examples/carousel/carousel.css')
-rw-r--r--docs/examples/carousel/carousel.css4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css
index 076ac232a..08448b99c 100644
--- a/docs/examples/carousel/carousel.css
+++ b/docs/examples/carousel/carousel.css
@@ -116,11 +116,11 @@ body {
}
.navbar-wrapper .container {
padding-right: 15px;
- padding-left: 15px;
+ padding-left: 15px;
}
.navbar-wrapper .navbar {
padding-right: 0;
- padding-left: 0;
+ padding-left: 0;
}
/* The navbar becomes detached from the top, so we round the corners */