From d1cf27bd0336b0dcec3fd40314e405e2a5bc0a66 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 8 Jun 2014 13:28:45 -0700
Subject: [PATCH] fix nested containers (addresses some of #13682)
---
docs/examples/carousel/carousel.css | 17 ++++-------------
docs/examples/theme/theme.css | 4 ++++
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css
index 08448b99c4..bd7567af3a 100644
--- a/docs/examples/carousel/carousel.css
+++ b/docs/examples/carousel/carousel.css
@@ -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,12 +101,6 @@ 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;
diff --git a/docs/examples/theme/theme.css b/docs/examples/theme/theme.css
index 181f99842a..b7c8d4cd23 100644
--- a/docs/examples/theme/theme.css
+++ b/docs/examples/theme/theme.css
@@ -12,3 +12,7 @@ body {
.theme-showcase > p > .btn {
margin: 5px 0;
}
+
+.theme-showcase .navbar .container {
+ width: auto;
+}
--
GitLab