From c54aaf818821665c4a21a6750b8d68d89a5aa7d1 Mon Sep 17 00:00:00 2001
From: Kevin Ball <kmball11@gmail.com>
Date: Thu, 20 Apr 2017 13:51:21 -0700
Subject: [PATCH] Update to #9711 in a way that doesn't modify underlying
 dependency

---
 .../normalize-scss/sass/normalize/_normalize-mixin.scss  | 2 +-
 scss/_global.scss                                        | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss b/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss
index edfd399a2..70a8d3d37 100644
--- a/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss
+++ b/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss
@@ -424,7 +424,7 @@
     optgroup,
     select,
     textarea {
-      font-family: inherit; /* 1 */
+      font-family: $base-font-family; /* 1 */
       font-size: 100%; /* 1 */
       @if $normalize-vertical-rhythm {
         line-height: ($base-line-height / $base-font-size) * 1em; /* 1 */
diff --git a/scss/_global.scss b/scss/_global.scss
index 91803de32..ebc6a39ca 100644
--- a/scss/_global.scss
+++ b/scss/_global.scss
@@ -206,6 +206,15 @@ $alert-color: get-color(alert);
     overflow: auto;
   }
 
+  // Make reset inherit font-family instead of settings sans-serif
+  button,
+  input,
+  optgroup,
+  select,
+  textarea {
+    font-family: inherit;
+  }
+
   // Internal classes to show/hide elements in JavaScript
   .is-visible {
     display: block !important;
-- 
2.47.2