Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2015-08-14 09:18:32 +0300
committerMark Otto <markdotto@gmail.com>2015-08-14 09:18:32 +0300
commit1da01e68baec6427874089f328a6063bd827a19d (patch)
treeb707a485a133fd0bdf69f73708c52f019755a472 /scss/_type.scss
parentd734653c3d24468b485e47710e70dc6296aa4baa (diff)
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
Diffstat (limited to 'scss/_type.scss')
-rw-r--r--scss/_type.scss14
1 files changed, 7 insertions, 7 deletions
diff --git a/scss/_type.scss b/scss/_type.scss
index 3d9988949c..fb8b371be0 100644
--- 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;
}