0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00

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

This commit is contained in:
Mark Otto 2014-09-08 10:29:45 -07:00
parent 48a1308e5d
commit f2783fbf83
9 changed files with 12 additions and 15 deletions

View File

@ -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;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -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;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -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);