updated -line-height to have the defualt value of -line-height

diff --git a/scss/components/_typography.scss b/scss/components/_typography.scss
index 7bf0cd0ebd154557bfcbf28b6feb35b10bafe7be..81bb40a9e9dfbe70d204a893c1aed2efd1d00733 100755 (executable)
--- a/scss/components/_typography.scss
+++ b/scss/components/_typography.scss
@@ -24,7 +24,7 @@ $global-font-size: 16px !default;
 
 /// Line height of body text.
 /// @type Number
-$body-line-height: 19px !default;
+$body-line-height: $global-line-height !default;
 
 /// Font family of headings.
 /// @type List

diff --git a/scss/settings/_settings.scss b/scss/settings/_settings.scss
index 5d25e82510edd958b125f94de74ca977209970f7..039cd81ce76831ace32d265696e5f65e87b75b89 100644 (file)
--- a/scss/settings/_settings.scss
+++ b/scss/settings/_settings.scss
@@ -59,7 +59,7 @@ $global-font-weight: normal;
 $header-color: inherit;
 $global-line-height: 1.3;
 $global-font-size: 16px;
-$body-line-height: 19px;
+$body-line-height: $global-line-height;
 $header-font-family: $body-font-family;
 $header-font-weight: $global-font-weight;
 $h1-font-size: 34px;
@@ -109,7 +109,7 @@ $button-color: $white;
 $button-color-alt: $medium-gray;
 $button-font-weight: bold;
 $button-margin: 0 0 $global-margin 0;
-$button-background: pink;
+$button-background: $primary-color;
 $button-border: 2px solid $button-background;
 $button-radius: $global-radius;
 $button-rounded: $global-rounded;