Skip to content

B
bootstrap
Commit f2783fbf authored by Mark Otto's avatar Mark Otto
Browse files
Options

Fixes #14319: Prevent jumbotron reflow by ensuring padding of .container isn't... 

Fixes #14319: Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding
parent 48a1308e
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 13 deletions
dist/css/bootstrap.css
View file @ f2783fbf
...@@ -4634,7 +4634,7 @@ a.list-group-item.active > .badge, ...@@ -4634,7 +4634,7 @@ a.list-group-item.active > .badge,
margin-left: 3px; margin-left: 3px;
} }
.jumbotron { .jumbotron {
padding: 30px; padding: 30px 15px;
margin-bottom: 30px; margin-bottom: 30px;
color: inherit; color: inherit;
background-color: #eee; background-color: #eee;
...@@ -4660,8 +4660,7 @@ a.list-group-item.active > .badge, ...@@ -4660,8 +4660,7 @@ a.list-group-item.active > .badge,
} }
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
.jumbotron { .jumbotron {
padding-top: 48px; padding: 48px 0;
padding-bottom: 48px;
} }
.container .jumbotron { .container .jumbotron {
padding-right: 60px; padding-right: 60px;
......
dist/css/bootstrap.css.map
View file @ f2783fbf
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ f2783fbf
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/assets/js/customize.min.js
View file @ f2783fbf
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/assets/js/raw-files.min.js
View file @ f2783fbf
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/dist/css/bootstrap.css
View file @ f2783fbf
...@@ -4634,7 +4634,7 @@ a.list-group-item.active > .badge, ...@@ -4634,7 +4634,7 @@ a.list-group-item.active > .badge,
margin-left: 3px; margin-left: 3px;
} }
.jumbotron { .jumbotron {
padding: 30px; padding: 30px 15px;
margin-bottom: 30px; margin-bottom: 30px;
color: inherit; color: inherit;
background-color: #eee; background-color: #eee;
...@@ -4660,8 +4660,7 @@ a.list-group-item.active > .badge, ...@@ -4660,8 +4660,7 @@ a.list-group-item.active > .badge,
} }
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
.jumbotron { .jumbotron {
padding-top: 48px; padding: 48px 0;
padding-bottom: 48px;
} }
.container .jumbotron { .container .jumbotron {
padding-right: 60px; padding-right: 60px;
......
docs/dist/css/bootstrap.css.map
View file @ f2783fbf
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ f2783fbf
This source diff could not be displayed because it is too large. You can view the blob instead.
less/jumbotron.less
View file @ f2783fbf
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.jumbotron { .jumbotron {
padding: @jumbotron-padding; padding: @jumbotron-padding (@jumbotron-padding / 2);
margin-bottom: @jumbotron-padding; margin-bottom: @jumbotron-padding;
color: @jumbotron-color; color: @jumbotron-color;
background-color: @jumbotron-bg; background-color: @jumbotron-bg;
...@@ -33,8 +33,7 @@ ...@@ -33,8 +33,7 @@
} }
@media screen and (min-width: @screen-sm-min) { @media screen and (min-width: @screen-sm-min) {
padding-top: (@jumbotron-padding * 1.6); padding: (@jumbotron-padding * 1.6) 0;
padding-bottom: (@jumbotron-padding * 1.6);
.container & { .container & {
padding-left: (@jumbotron-padding * 2); padding-left: (@jumbotron-padding * 2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment