rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #14563 from twbs/fixes_14319

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/css/bootstrap.css vendored
View File

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

2
dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/customize.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/raw-files.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
docs/dist/css/bootstrap.css vendored
View File

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

2
docs/dist/css/bootstrap.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
docs/dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
less/jumbotron.less
View File

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