From a11dbb9186d78e398e38b9e05286fdabbfa336b4 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Thu, 26 Apr 2018 23:13:21 -0500
Subject: [PATCH] jquery-ui: fix fonts in dialog boxes (#3671).

Fix the default jquery-ui theme overriding our body font with Arial.
---
 app/assets/stylesheets/common/000_vars.scss         | 1 +
 app/assets/stylesheets/common/020_base.scss         | 2 +-
 app/assets/stylesheets/common/jquery_ui_custom.scss | 8 ++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/000_vars.scss b/app/assets/stylesheets/common/000_vars.scss
index 4ad0d4c10..348a0e35e 100644
--- a/app/assets/stylesheets/common/000_vars.scss
+++ b/app/assets/stylesheets/common/000_vars.scss
@@ -19,6 +19,7 @@ $h3_padding: 0.8em 0 0.25em 0;
 $h4_padding: 0.8em 0 0.25em 0;
 $baseline: 1em;
 $basefont: 100%;
+$base_font_family: Verdana, Helvetica, sans-serif;
 $preview_has_children_color: #0F0;
 $preview_has_parent_color: #CC0;
 $preview_deleted_color: #000;
diff --git a/app/assets/stylesheets/common/020_base.scss b/app/assets/stylesheets/common/020_base.scss
index e86633112..a383d1557 100644
--- a/app/assets/stylesheets/common/020_base.scss
+++ b/app/assets/stylesheets/common/020_base.scss
@@ -2,7 +2,7 @@
 
 body {
   background-color: #FFF;
-  font-family: Verdana, Helvetica, sans-serif;
+  font-family: $base_font_family;
   padding: 0;
   margin: 0;
   font-size: 87.5%;
diff --git a/app/assets/stylesheets/common/jquery_ui_custom.scss b/app/assets/stylesheets/common/jquery_ui_custom.scss
index ad19efe25..05367f3ca 100644
--- a/app/assets/stylesheets/common/jquery_ui_custom.scss
+++ b/app/assets/stylesheets/common/jquery_ui_custom.scss
@@ -1,3 +1,11 @@
+.ui-widget {
+  font-family: $base_font_family;
+
+  input, select, textarea, button {
+    font-family: $base_font_family;
+  }
+}
+
 div.ui-dialog {
   height: auto! important;
   overflow: visible;