Bug 30952: Remove Poppins font, use Bootstrap 5 font stack instead

Issue #20

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bold-webfont.woff b/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bold-webfont.woff
deleted file mode 100644 (file)
index 62b0310..0000000
Binary files a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bold-webfont.woff and /dev/null differ

diff --git a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bold-webfont.woff2 b/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bold-webfont.woff2
deleted file mode 100644 (file)
index a146c2d..0000000
Binary files a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bold-webfont.woff2 and /dev/null differ

diff --git a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bolditalic-webfont.woff b/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bolditalic-webfont.woff
deleted file mode 100644 (file)
index b290421..0000000
Binary files a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bolditalic-webfont.woff and /dev/null differ

diff --git a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bolditalic-webfont.woff2 b/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bolditalic-webfont.woff2
deleted file mode 100644 (file)
index a633004..0000000
Binary files a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-bolditalic-webfont.woff2 and /dev/null differ

diff --git a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-italic-webfont.woff b/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-italic-webfont.woff
deleted file mode 100644 (file)
index ed7e6c2..0000000
Binary files a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-italic-webfont.woff and /dev/null differ

diff --git a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-italic-webfont.woff2 b/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-italic-webfont.woff2
deleted file mode 100644 (file)
index 02bafd4..0000000
Binary files a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-italic-webfont.woff2 and /dev/null differ

diff --git a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-regular-webfont.woff b/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-regular-webfont.woff
deleted file mode 100644 (file)
index eec1671..0000000
Binary files a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-regular-webfont.woff and /dev/null differ

diff --git a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-regular-webfont.woff2 b/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-regular-webfont.woff2
deleted file mode 100644 (file)
index 71ca7ec..0000000
Binary files a/koha-tmpl/intranet-tmpl/prog/css/fonts/poppins-regular-webfont.woff2 and /dev/null differ

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss
index 87b4368..3d111d8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_variables.scss
@@ -1,2 +1,23 @@
 $green-text-color: #006100;
 $background-color-primary: #418940;
+
+// Copied from Bootstrap 5 without system-ui because of
+// https://infinnie.github.io/blog/2017/systemui.html
+$font-family-sans-serif:
+  // Safari for macOS and iOS (San Francisco)
+  -apple-system,
+  // Windows
+  "Segoe UI",
+  // Android
+  Roboto,
+  // older macOS and iOS
+  "Helvetica Neue",
+  // Linux
+  "Noto Sans",
+  "Liberation Sans",
+  // Basic web fallback
+  Arial,
+  // Sans serif fallback
+  sans-serif,
+  // Emoji fonts
+  "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 3fe0436..760413f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -485,7 +485,7 @@ main {
 }
 
 body {
-    font-family: "poppins", "Arial", "sans-serif";
+    font-family: $font-family-sans-serif;
     font-size: 13px;
     line-height: 1.22;
     padding: 0 0 4em;