Fixes #1728

diff --git a/scss/foundation/components/_buttons.scss b/scss/foundation/components/_buttons.scss
index ca8244f55bc224d61a6b96691d7e09a962dd8e3e..2b65d2644a7bb3e97dfb830875dae6aac46b8901 100644 (file)
--- a/scss/foundation/components/_buttons.scss
+++ b/scss/foundation/components/_buttons.scss
@@ -13,6 +13,7 @@ $button-display:          inline-block !default;
 $button-margin-bottom:    emCalc(20px) !default;
 
 // We use these to control button text styles.
+$button-font-family:      inherit !default;
 $button-font-color:       #fff !default;
 $button-font-color-alt:   #333 !default;
 $button-font-med:         emCalc(16px) !default;
@@ -47,7 +48,7 @@ $button-disabled-opacity: 0.6 !default;
     border-style: $button-border-style;
     border-width: $button-border-width;
     cursor: pointer;
-    font-family: inherit;
+    font-family: $button-font-family;
     font-weight: $button-font-weight;
     line-height: 1;
     margin: 0 0 $button-margin-bottom;

diff --git a/scss/foundation/components/_forms.scss b/scss/foundation/components/_forms.scss
index 8c3dd71f25d69aceaae992c5c21579700f67b850..c27d95795e558ddd13cebf70513290d4ad69e930 100644 (file)
--- a/scss/foundation/components/_forms.scss
+++ b/scss/foundation/components/_forms.scss
@@ -11,6 +11,7 @@ $label-font-size:                    emCalc(14px) !default;
 $label-font-weight:                  500 !default;
 $label-font-color:                   lighten(#000, 30%) !default;
 $label-bottom-margin:                emCalc(3px) !default;
+$input-font-family:                  inherit !default;
 $input-font-color:                   rgba(0,0,0,0.75) !default;
 $input-font-size:                    emCalc(14px) !default;
 $input-bg-color:                     #fff !default;
@@ -78,7 +79,7 @@ $input-error-message-font-color-alt: #333 !default;
 // We use this mixin to give all basic form elements their style
 @mixin form-element() {
   background-color: $input-bg-color;
-  font-family: inherit;
+  font-family: $input-font-family;
   border: $input-border-width $input-border-style $input-border-color;
   -webkit-box-shadow: $input-box-shadow;
   box-shadow: $input-box-shadow;

diff --git a/templates/project/scss/_settings.scss b/templates/project/scss/_settings.scss
index 33e35e28548dab631e597b4ed4872b628d307c20..0af0135edf6ef832590e61083d2500690efe6a82 100644 (file)
--- a/templates/project/scss/_settings.scss
+++ b/templates/project/scss/_settings.scss
@@ -178,6 +178,7 @@
 // $label-font-weight: 500;
 // $label-font-color: lighten(#000, 30%);
 // $label-bottom-margin: emCalc(3px);
+// $input-font-family: inherit;
 // $input-font-color: rgba(0,0,0,0.75);
 // $input-font-size: emCalc(14px);
 // $input-bg-color: #fff;
@@ -229,6 +230,7 @@
 // $button-margin-bottom: emCalc(20px);
 
 // We use these to control button text styles.
+// $button-font-family: inherit;
 // $button-font-color: #fff;
 // $button-font-color-alt: #333;
 // $button-font-med: emCalc(16px);