1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Merge pull request #14563 from twbs/fixes_14319

Fixes #14319: Jumbotron reflow
This commit is contained in:
Mark Otto 2014-09-08 10:45:18 -07:00
commit 5578733238
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);