diff options
| author | Mark Otto <[email protected]> | 2014-03-06 22:40:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-06 22:40:25 -0800 |
| commit | 12c619f5b9149a4d3f4d24efe106504b6a8a5004 (patch) | |
| tree | dacdd064110d04b8195151c08ef4e5713ba3ea24 /docs/examples/carousel/carousel.css | |
| parent | f4dd6221d4e7a8eaa9cd8ebe0457ad016f5058cc (diff) | |
| parent | 7e299c6a49bced5d2c2581a5504ddf7dbcaf041f (diff) | |
| download | bootstrap-12c619f5b9149a4d3f4d24efe106504b6a8a5004.tar.xz bootstrap-12c619f5b9149a4d3f4d24efe106504b6a8a5004.zip | |
Merge branch 'master' into boulox-responsive-embed
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/css.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/examples/carousel/carousel.css')
| -rw-r--r-- | docs/examples/carousel/carousel.css | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css index a728bd899..08448b99c 100644 --- a/docs/examples/carousel/carousel.css +++ b/docs/examples/carousel/carousel.css @@ -16,19 +16,19 @@ body { .navbar-wrapper { position: absolute; top: 0; - left: 0; right: 0; + left: 0; z-index: 20; } /* Flip around the padding for proper display in narrow viewports */ .navbar-wrapper .container { - padding-left: 0; padding-right: 0; + padding-left: 0; } .navbar-wrapper .navbar { - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } @@ -65,21 +65,21 @@ body { /* Pad the edges of the mobile views a bit */ .marketing { - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } /* Center align the text within the three columns below the carousel */ .marketing .col-lg-4 { - text-align: center; margin-bottom: 20px; + text-align: center; } .marketing h2 { font-weight: normal; } .marketing .col-lg-4 p { - margin-left: 10px; margin-right: 10px; + margin-left: 10px; } @@ -106,8 +106,8 @@ body { /* Remove the edge padding needed for mobile */ .marketing { - padding-left: 0; padding-right: 0; + padding-left: 0; } /* Navbar positioning foo */ @@ -115,12 +115,12 @@ body { margin-top: 20px; } .navbar-wrapper .container { - padding-left: 15px; padding-right: 15px; + padding-left: 15px; } .navbar-wrapper .navbar { - padding-left: 0; padding-right: 0; + padding-left: 0; } /* The navbar becomes detached from the top, so we round the corners */ @@ -138,7 +138,6 @@ body { .featurette-heading { font-size: 50px; } - } @media (min-width: 992px) { |