Skip to content

Commit

Permalink
Merge pull request #18260 from twbs/fix-18259
Browse files Browse the repository at this point in the history
Move viewport-dependent padding tweak into main .jumbotron block
  • Loading branch information
mdo committed Nov 30, 2015
2 parents 94d7a8f + 9da0b71 commit 1f487f7
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions scss/_jumbotron.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,16 @@
margin-bottom: $jumbotron-padding;
background-color: $jumbotron-bg;
@include border-radius($border-radius-lg);

@include media-breakpoint-up(sm) {
padding: ($jumbotron-padding * 2) $jumbotron-padding;
}
}

.jumbotron-hr {
border-top-color: darken($jumbotron-bg, 10%);
}

@include media-breakpoint-up(sm) {
.jumbotron {
padding: ($jumbotron-padding * 2) $jumbotron-padding;
}
}

.jumbotron-fluid {
padding-right: 0;
padding-left: 0;
Expand Down

0 comments on commit 1f487f7

Please sign in to comment.