variables cleanup

- new vars for .lead size and weight (previously had none)
- new var for default margin-bottom on h1-h6 elements (previously had none)
- rearranged vars to combine two typography sections into one in variables.scss
- reassigned border-width var to hr-border-width
- made hr-border more specific as hr-border-color

diff --git a/scss/_type.scss b/scss/_type.scss
index 3d9988949cbb11204908a8542663e5d7f99da92a..fb8b371be045c0853d15573d2287360a1c244347 100644 (file)
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -18,12 +18,12 @@ h1, h2, h3, h4, h5, h6,
 h1, .h1,
 h2, .h2,
 h3, .h3 {
-  margin-bottom: ($spacer / 2);
+  margin-bottom: $headings-margin-bottom;
 }
 h4, .h4,
 h5, .h5,
 h6, .h6 {
-  margin-bottom: ($spacer / 2);
+  margin-bottom: $headings-margin-bottom;
 }
 
 h1, .h1 { font-size: $font-size-h1; }
@@ -34,8 +34,8 @@ h5, .h5 { font-size: $font-size-h5; }
 h6, .h6 { font-size: $font-size-h6; }
 
 .lead {
-  font-size: 1.25rem;
-  font-weight: 300;
+  font-size: $lead-font-size;
+  font-weight: $lead-font-weight;
 }
 
 // Type display classes
@@ -62,10 +62,10 @@ h6, .h6 { font-size: $font-size-h6; }
 //
 
 hr {
-  margin-top: $spacer;
-  margin-bottom: $spacer;
+  margin-top: $spacer-y;
+  margin-bottom: $spacer-y;
   border: 0;
-  border-top: .0625rem solid $hr-border;
+  border-top: $hr-border-width solid $hr-border-color;
 }
 
 

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2322eeadd7a2b76bdd0229b3a2b73bfeaf78aa67..21f17f9445196d307f6e41a056c296669107f86d 100644 (file)
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -154,11 +154,25 @@ $display4-weight:             300 !default;
 
 $line-height:                1.5 !default;
 
+$headings-margin-bottom:     ($spacer / 2) !default;
 $headings-font-family:       inherit !default;
 $headings-font-weight:       500 !default;
 $headings-line-height:       1.1 !default;
 $headings-color:             inherit !default;
 
+$lead-font-size:             1.25rem !default;
+$lead-font-weight:           300 !default;
+
+$text-muted:                  $gray-light !default;
+
+$abbr-border-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-color:             rgba(0,0,0,.1) !default;
+$hr-border-width:             $border-width;
 
 
 // Components
@@ -640,14 +654,3 @@ $pre-bg:                      #f7f7f9 !default;
 $pre-color:                   $gray-dark !default;
 $pre-border-color:            #ccc !default;
 $pre-scrollable-max-height:   340px !default;
-
-
-// Type
-
-$text-muted:                  $gray-light !default;
-$abbr-border-color:           $gray-light !default;
-$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:                   rgba(0,0,0,.1) !default;