rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-11 08:54:23 +01:00
Code Issues Actions Packages Releases Activity

variables cleanup

Browse Source 
- 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
This commit is contained in:
Mark Otto 2015-08-13 23:18:32 -07:00
parent d734653c3d
commit 1da01e68ba
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scss/_type.scss
View File

@ -18,12 +18,12 @@ h1, h2, h3, h4, h5, h6,
h1, .h1, h1, .h1,
h2, .h2, h2, .h2,
h3, .h3 { h3, .h3 {
margin-bottom: ($spacer / 2); margin-bottom: $headings-margin-bottom;
} }
h4, .h4, h4, .h4,
h5, .h5, h5, .h5,
h6, .h6 { h6, .h6 {
margin-bottom: ($spacer / 2); margin-bottom: $headings-margin-bottom;
} }
h1, .h1 { font-size: $font-size-h1; } 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; } h6, .h6 { font-size: $font-size-h6; }
.lead { .lead {
font-size: 1.25rem; font-size: $lead-font-size;
font-weight: 300; font-weight: $lead-font-weight;
} }
// Type display classes // Type display classes
@ -62,10 +62,10 @@ h6, .h6 { font-size: $font-size-h6; }
// //
hr { hr {
margin-top: $spacer; margin-top: $spacer-y;
margin-bottom: $spacer; margin-bottom: $spacer-y;
border: 0; border: 0;
border-top: .0625rem solid $hr-border; border-top: $hr-border-width solid $hr-border-color;
} }

25
scss/_variables.scss
View File

@ -154,11 +154,25 @@ $display4-weight: 300 !default;
$line-height: 1.5 !default; $line-height: 1.5 !default;
$headings-margin-bottom: ($spacer / 2) !default;
$headings-font-family: inherit !default; $headings-font-family: inherit !default;
$headings-font-weight: 500 !default; $headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default; $headings-line-height: 1.1 !default;
$headings-color: inherit !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 // Components
@ -640,14 +654,3 @@ $pre-bg: #f7f7f9 !default;
$pre-color: $gray-dark !default; $pre-color: $gray-dark !default;
$pre-border-color: #ccc !default; $pre-border-color: #ccc !default;
$pre-scrollable-max-height: 340px !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;