From be6e56e8634843b15aa9ed0ed617ac349b68e019 Mon Sep 17 00:00:00 2001 From: Tim Hartwick Date: Thu, 28 Apr 2016 15:19:31 -0700 Subject: [PATCH] updated -line-height to have the defualt value of -line-height --- scss/components/_typography.scss | 2 +- scss/settings/_settings.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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; -- 2.47.2