From: Tim Hartwick <tdhartwick2@gmail.com>
Date: Thu, 28 Apr 2016 22:19:31 +0000 (-0700)
Subject: updated -line-height to have the defualt value of -line-height
X-Git-Tag: v2.2.1~8^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be6e56e8634843b15aa9ed0ed617ac349b68e019;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

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

diff --git a/scss/components/_typography.scss b/scss/components/_typography.scss
index 7bf0cd0e..81bb40a9 100755
--- 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 5d25e825..039cd81c 100644
--- 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;