mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 18:40:03 +00:00
Code Issues Projects Releases Wiki Activity

fix nested containers (addresses some of #13682)

Browse Source
This commit is contained in:
Mark Otto 2014-06-08 13:28:45 -07:00
parent 1e3b93804f
commit d1cf27bd03
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/examples/carousel/carousel.css
View File

@ -22,7 +22,7 @@ body {
} }
/* Flip around the padding for proper display in narrow viewports */ /* Flip around the padding for proper display in narrow viewports */
.navbar-wrapper .container { .navbar-wrapper > .container {
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
} }
@ -30,6 +30,9 @@ body {
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
} }
.navbar-wrapper .navbar .container {
width: auto;
}
/* CUSTOMIZE THE CAROUSEL /* CUSTOMIZE THE CAROUSEL
@ -63,12 +66,6 @@ body {
/* MARKETING CONTENT /* MARKETING CONTENT
-------------------------------------------------- */ -------------------------------------------------- */
/* Pad the edges of the mobile views a bit */
.marketing {
padding-right: 15px;
padding-left: 15px;
}
/* Center align the text within the three columns below the carousel */ /* Center align the text within the three columns below the carousel */
.marketing .col-lg-4 { .marketing .col-lg-4 {
margin-bottom: 20px; margin-bottom: 20px;
@ -104,12 +101,6 @@ body {
@media (min-width: 768px) { @media (min-width: 768px) {
/* Remove the edge padding needed for mobile */
.marketing {
padding-right: 0;
padding-left: 0;
}
/* Navbar positioning foo */ /* Navbar positioning foo */
.navbar-wrapper { .navbar-wrapper {
margin-top: 20px; margin-top: 20px;

4
docs/examples/theme/theme.css
View File

@ -12,3 +12,7 @@ body {
.theme-showcase > p > .btn { .theme-showcase > p > .btn {
margin: 5px 0; margin: 5px 0;
} }
.theme-showcase .navbar .container {
width: auto;
}