Merge pull request #14563 from twbs/fixes_14319

Fixes #14319: Jumbotron reflow

Merge pull request #14563 from twbs/fixes_14319
Fixes #14319: Jumbotron reflow
55787332 · Mark Otto · 8bb1a3fc · f2783fbf · 55787332 · 55787332
Commit 55787332 authored 10 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 10 additions and 13 deletions
+10 -13
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4634,7 +4634,7 @@ a.list-group-item.active > .badge,
  margin-left: 3px;
 }
 .jumbotron {
-  padding: 30px;
+  padding: 30px 15px;
  margin-bottom: 30px;
  color: inherit;
  background-color: #eee;
@@ -4660,8 +4660,7 @@ a.list-group-item.active > .badge,
 }
 @media screen and (min-width: 768px) {
  .jumbotron {
-    padding-top: 48px;
-    padding-bottom: 48px;
+    padding: 48px 0;
  }
  .container .jumbotron {
    padding-right: 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
@@ -4634,7 +4634,7 @@ a.list-group-item.active > .badge,
  margin-left: 3px;
 }
 .jumbotron {
-  padding: 30px;
+  padding: 30px 15px;
  margin-bottom: 30px;
  color: inherit;
  background-color: #eee;
@@ -4660,8 +4660,7 @@ a.list-group-item.active > .badge,
 }
 @media screen and (min-width: 768px) {
  .jumbotron {
-    padding-top: 48px;
-    padding-bottom: 48px;
+    padding: 48px 0;
  }
  .container .jumbotron {
    padding-right: 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
@@ -4,7 +4,7 @@


 .jumbotron {
-  padding: @jumbotron-padding;
+  padding: @jumbotron-padding (@jumbotron-padding / 2);
  margin-bottom: @jumbotron-padding;
  color: @jumbotron-color;
  background-color: @jumbotron-bg;
@@ -33,8 +33,7 @@
  }

  @media screen and (min-width: @screen-sm-min) {
-    padding-top:    (@jumbotron-padding * 1.6);
-    padding-bottom: (@jumbotron-padding * 1.6);
+    padding: (@jumbotron-padding * 1.6) 0;

    .container & {
      padding-left:  (@jumbotron-padding * 2);