aboutsummaryrefslogtreecommitdiff
path: root/docs/examples/carousel/carousel.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-03-06 21:32:52 -0800
committerMark Otto <[email protected]>2014-03-06 21:32:52 -0800
commitc8614c0f15f0ce78426c6403e57aff22c3ce2beb (patch)
tree673d1a347374a8bf53a127c050dbc57762af3782 /docs/examples/carousel/carousel.css
parentd1a7271ea1272e0f9775d49e6a84ee49819e0094 (diff)
parentfab10b643eb1a2038fb31305f0b038b7a9a8554d (diff)
downloadbootstrap-c8614c0f15f0ce78426c6403e57aff22c3ce2beb.tar.xz
bootstrap-c8614c0f15f0ce78426c6403e57aff22c3ce2beb.zip
Merge branch 'master' into pr/12490
Conflicts: less/list-group.less
Diffstat (limited to 'docs/examples/carousel/carousel.css')
-rw-r--r--docs/examples/carousel/carousel.css19
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) {