aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorPatrick Yeo <[email protected]>2017-06-08 18:05:27 -0700
committerMark Otto <[email protected]>2017-06-13 08:46:29 -0700
commita362d62d316cb95800d82bbfbebee6ebdb4debe8 (patch)
treef73fcdaa34e1bae7a918f90f48f4035a237495bb /scss
parentc349f5917430166889e2f8a6697878e4ee5f3f7c (diff)
downloadbootstrap-a362d62d316cb95800d82bbfbebee6ebdb4debe8.tar.xz
bootstrap-a362d62d316cb95800d82bbfbebee6ebdb4debe8.zip
Rename `$font-size-h*` to `$h*-font-size` for consistency (#22414)
Diffstat (limited to 'scss')
-rw-r--r--scss/_type.scss12
-rw-r--r--scss/_variables.scss12
2 files changed, 12 insertions, 12 deletions
diff --git a/scss/_type.scss b/scss/_type.scss
index fc9c791c4..5ecc336ae 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -11,12 +11,12 @@ h1, h2, h3, h4, h5, h6,
color: $headings-color;
}
-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, .h1 { font-size: $h1-font-size; }
+h2, .h2 { font-size: $h2-font-size; }
+h3, .h3 { font-size: $h3-font-size; }
+h4, .h4 { font-size: $h4-font-size; }
+h5, .h5 { font-size: $h5-font-size; }
+h6, .h6 { font-size: $h6-font-size; }
.lead {
font-size: $lead-font-size;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 69d223965..46a0a89c3 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -262,12 +262,12 @@ $font-weight-bold: bold !default;
$font-weight-base: $font-weight-normal !default;
$line-height-base: 1.5 !default;
-$font-size-h1: 2.5rem !default;
-$font-size-h2: 2rem !default;
-$font-size-h3: 1.75rem !default;
-$font-size-h4: 1.5rem !default;
-$font-size-h5: 1.25rem !default;
-$font-size-h6: 1rem !default;
+$h1-font-size: 2.5rem !default;
+$h2-font-size: 2rem !default;
+$h3-font-size: 1.75rem !default;
+$h4-font-size: 1.5rem !default;
+$h5-font-size: 1.25rem !default;
+$h6-font-size: 1rem !default;
$headings-margin-bottom: ($spacer / 2) !default;
$headings-font-family: inherit !default;