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:
commit
5578733238
9 changed files with 12 additions and 15 deletions
5
dist/css/bootstrap.css
vendored
5
dist/css/bootstrap.css
vendored
|
@ -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;
|
||||
|
|
2
dist/css/bootstrap.css.map
vendored
2
dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/customize.min.js
vendored
2
docs/assets/js/customize.min.js
vendored
File diff suppressed because one or more lines are too long
2
docs/assets/js/raw-files.min.js
vendored
2
docs/assets/js/raw-files.min.js
vendored
File diff suppressed because one or more lines are too long
5
docs/dist/css/bootstrap.css
vendored
5
docs/dist/css/bootstrap.css
vendored
|
@ -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;
|
||||
|
|
2
docs/dist/css/bootstrap.css.map
vendored
2
docs/dist/css/bootstrap.css.map
vendored
File diff suppressed because one or more lines are too long
2
docs/dist/css/bootstrap.min.css
vendored
2
docs/dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue