aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-11-29 19:49:20 -0800
committerMark Otto <[email protected]>2015-11-29 19:49:20 -0800
commit1f487f79d3a4bf4ea8e7bbaf7977b79b5e4573ef (patch)
treeb39ac0619f781f89c9486e0a80dba6de05e8451e /scss
parent94d7a8f4ef9d90795e33102dce1ec08a329300b6 (diff)
parent9da0b7140aea21c0986be5d9db58c30e041ae12c (diff)
downloadbootstrap-1f487f79d3a4bf4ea8e7bbaf7977b79b5e4573ef.tar.xz
bootstrap-1f487f79d3a4bf4ea8e7bbaf7977b79b5e4573ef.zip
Merge pull request #18260 from twbs/fix-18259
Move viewport-dependent padding tweak into main .jumbotron block
Diffstat (limited to 'scss')
-rw-r--r--scss/_jumbotron.scss10
1 files changed, 4 insertions, 6 deletions
diff --git a/scss/_jumbotron.scss b/scss/_jumbotron.scss
index 97806afed..b12d465d9 100644
--- a/scss/_jumbotron.scss
+++ b/scss/_jumbotron.scss
@@ -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;