mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

merge in v3.2.0 changes; nuke a dupe _gh_pages dir

Browse Source
This commit is contained in:
Mark Otto
2014-06-26 09:46:59 -07:00
parent ed14e5132b
commit 2c3d8ce134
73 changed files with 2979 additions and 11634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/carousel/carousel.css
+6 -15
View File
@@ -22,7 +22,7 @@ body {
}
/* Flip around the padding for proper display in narrow viewports */
.navbar-wrapper .container {
.navbar-wrapper > .container {
padding-right: 0;
padding-left: 0;
}
@@ -30,6 +30,9 @@ body {
padding-right: 15px;
padding-left: 15px;
}
.navbar-wrapper .navbar .container {
width: auto;
}
/* CUSTOMIZE THE CAROUSEL
@@ -63,12 +66,6 @@ body {
/* 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 */
.marketing .col-lg-4 {
margin-bottom: 20px;
@@ -104,23 +101,17 @@ body {
@media (min-width: 768px) {
/* Remove the edge padding needed for mobile */
.marketing {
padding-right: 0;
padding-left: 0;
}
/* Navbar positioning foo */
.navbar-wrapper {
margin-top: 20px;
}
.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 */