diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-11-02 03:23:17 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-11-02 03:23:17 +0300 |
commit | 73d7b260016da2ad7aa39c61ce4791fed9e27876 (patch) | |
tree | 220c17415b3ca9ea017f6ef242fa9115c0ea5de7 /assets/stylesheets/bootstrap/_type.scss | |
parent | 6014a8dd373d12da2d1a2553d81a33a547e4f62f (diff) |
rake update[v4-dev]
Diffstat (limited to 'assets/stylesheets/bootstrap/_type.scss')
-rw-r--r-- | assets/stylesheets/bootstrap/_type.scss | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/assets/stylesheets/bootstrap/_type.scss b/assets/stylesheets/bootstrap/_type.scss index 1832098..1d55ccb 100644 --- a/assets/stylesheets/bootstrap/_type.scss +++ b/assets/stylesheets/bootstrap/_type.scss @@ -19,12 +19,22 @@ h6, .h6 { margin-bottom: $headings-margin-bottom; } -h1, .h1 { font-size: $font-size-h1; } -h2, .h2 { font-size: $font-size-h2; } -h3, .h3 { font-size: $font-size-h3; } -h4, .h4 { font-size: $font-size-h4; } -h5, .h5 { font-size: $font-size-h5; } -h6, .h6 { font-size: $font-size-h6; } +h1 { font-size: $font-size-h1; } +h2 { font-size: $font-size-h2; } +h3 { font-size: $font-size-h3; } +h4 { font-size: $font-size-h4; } +h5 { font-size: $font-size-h5; } +h6 { font-size: $font-size-h6; } + +// These declarations are kept separate from and placed after +// the previous tag-based declarations so that the classes beat the tags in +// the CSS cascade, and thus <h1 class="h2"> will be styled like an h2. +.h1 { font-size: $font-size-h1; } +.h2 { font-size: $font-size-h2; } +.h3 { font-size: $font-size-h3; } +.h4 { font-size: $font-size-h4; } +.h5 { font-size: $font-size-h5; } +.h6 { font-size: $font-size-h6; } .lead { font-size: $lead-font-size; |