aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-08-12 20:28:46 -0700
committerMark Otto <[email protected]>2015-08-12 20:28:46 -0700
commit314161cb179be0846ac1190abf2fc442965ea300 (patch)
tree3dc9a3eedff6dabdbb69b45bf62fab451199fb55 /scss
parent0babe3568c01face310ad5446a16cec08043a7d5 (diff)
downloadbootstrap-314161cb179be0846ac1190abf2fc442965ea300.tar.xz
bootstrap-314161cb179be0846ac1190abf2fc442965ea300.zip
remove hella vars from the jumbotron
Diffstat (limited to 'scss')
-rw-r--r--scss/_jumbotron.scss9
-rw-r--r--scss/_variables.scss6
2 files changed, 1 insertions, 14 deletions
diff --git a/scss/_jumbotron.scss b/scss/_jumbotron.scss
index d60793efd..eea2e4883 100644
--- a/scss/_jumbotron.scss
+++ b/scss/_jumbotron.scss
@@ -6,15 +6,10 @@
.jumbotron {
padding: $jumbotron-padding ($jumbotron-padding / 2);
margin-bottom: $jumbotron-padding;
- color: $jumbotron-color;
background-color: $jumbotron-bg;
@include border-radius($border-radius-lg);
}
-.jumbotron-heading {
- color: $jumbotron-heading-color;
-}
-
.jumbotron-hr {
border-top-color: darken($jumbotron-bg, 10%);
}
@@ -23,10 +18,6 @@
.jumbotron {
padding: ($jumbotron-padding * 2) $jumbotron-padding;
}
-
- .jumbotron-heading {
- font-size: $jumbotron-heading-font-size;
- }
}
.jumbotron-fluid {
diff --git a/scss/_variables.scss b/scss/_variables.scss
index a51001a37..037265ec7 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -420,11 +420,7 @@ $pager-disabled-color: $pagination-disabled-color !default;
// Jumbotron
$jumbotron-padding: 2rem !default;
-$jumbotron-color: inherit !default;
$jumbotron-bg: $gray-lighter !default;
-$jumbotron-heading-color: inherit !default;
-$jumbotron-heading-font-size: ($font-size-base * 4.5) !default;
-// $jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
// Form states and alerts
@@ -632,4 +628,4 @@ $headings-small-color: $gray-light !default;
$blockquote-small-color: $gray-light !default;
$blockquote-font-size: ($font-size-base * 1.25) !default;
$blockquote-border-color: $gray-lighter !default;
-$hr-border: $gray-lighter !default;
+$hr-border: rgba(0,0,0,.1) !default;