Fixes #14979: Override .jumbotron padding within .container-fluid to match .container

8fbb2bbb · Mark Otto · 2862c303 · 8fbb2bbb · 8fbb2bbb · 8fbb2bbb
Commit 8fbb2bbb authored 10 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 10 additions and 7 deletions
+10 -7
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4675,7 +4675,8 @@ a.list-group-item.active > .badge,
  .jumbotron {
    padding: 48px 0;
  }
-  .container .jumbotron {
+  .container .jumbotron,
+  .container-fluid .jumbotron {
    padding-right: 60px;
    padding-left: 60px;
  }

--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/docs/assets/js/raw-files.min.js
+++ b/docs/assets/js/raw-files.min.js
--- a/docs/dist/css/bootstrap.css
+++ b/docs/dist/css/bootstrap.css
@@ -4675,7 +4675,8 @@ a.list-group-item.active > .badge,
  .jumbotron {
    padding: 48px 0;
  }
-  .container .jumbotron {
+  .container .jumbotron,
+  .container-fluid .jumbotron {
    padding-right: 60px;
    padding-left: 60px;
  }

--- a/docs/dist/css/bootstrap.css.map
+++ b/docs/dist/css/bootstrap.css.map
--- a/docs/dist/css/bootstrap.min.css
+++ b/docs/dist/css/bootstrap.min.css
--- a/less/jumbotron.less
+++ b/less/jumbotron.less
@@ -35,7 +35,8 @@
  @media screen and (min-width: @screen-sm-min) {
    padding: (@jumbotron-padding * 1.6) 0;

-    .container & {
+    .container &,
+    .container-fluid & {
      padding-left:  (@jumbotron-padding * 2);
      padding-right: (@jumbotron-padding * 2);
    }