From 54005ec2fdadd6537dae933e693dc915d3348e54 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 7 Apr 2021 13:43:40 +0000
Subject: [PATCH] Bug 27566: (follow-up) Add generic font family to prevent
 unstyled select tags

This correction fixes the previous patch which was dumb and stupid.

This patch adds a default font family "sans-serif" to the OPAC CSS as a
workaround for this Firefox bug:

font-family isn't honored in `<option>` element within `<select>`
dropdown
https://bugzilla.mozilla.org/show_bug.cgi?id=1536148

To test, apply the patch and rebuild the OPAC CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).

 - Open the OPAC main page in Firefox.
 - Click the search type dropdown. The options should be styled using
   your system's default sans-serif font rather than a serif font.
 - Check that other areas of the OPAC are still styled with the correct
   "NotoSans" font. An error with this patch should be obvious when
   looking at a logged-in user's checkouts.

Signed-off-by: David Nind <david@davidnind.com>
---
 koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/css/src/_fonts.scss  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
index 91d326a909..65e238d80b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
@@ -1072,7 +1072,7 @@ button {
     option,
     select,
     textarea {
-        font-family: "NotoSans";
+        font-family: "NotoSans", sans-serif;
     }
 }
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_fonts.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_fonts.scss
index 85d77fb352..b0ebcd45fa 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_fonts.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_fonts.scss
@@ -1,5 +1,5 @@
 @font-face {
-    font-family: "NotoSans, sans-serif";
+    font-family: "NotoSans";
     font-style: normal;
     font-weight: 400;
     src: local("Noto Sans Regular"),
@@ -8,7 +8,7 @@
 }
 
 @font-face {
-    font-family: "NotoSans, sans-serif";
+    font-family: "NotoSans";
     font-style: bold;
     font-weight: 700;
     src: local("Noto Sans Bold"),
@@ -17,7 +17,7 @@
 }
 
 @font-face {
-    font-family: "NotoSans, sans-serif";
+    font-family: "NotoSans";
     font-style: italic;
     font-weight: 400;
     src: local("Noto Sans Italic"),
@@ -26,7 +26,7 @@
 }
 
 @font-face {
-    font-family: "NotoSans, sans-serif";
+    font-family: "NotoSans";
     font-style: italic;
     font-weight: 700;
     src: local("Noto Sans Bold Italic"),
-- 
2.11.0