From 1b86721dcb01b1ac339a8f445a6c1d9543fe3af5 Mon Sep 17 00:00:00 2001
From: Bob den Otter <bob@twokings.nl>
Date: Thu, 15 Oct 2020 16:27:43 +0200
Subject: [PATCH] Updating the system font stack for 2020

---
 assets/scss/init/_variables.scss           | 2 +-
 public/theme/skeleton/css/new.css          | 2 +-
 templates/_partials/notification.html.twig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/scss/init/_variables.scss b/assets/scss/init/_variables.scss
index 82af2789d..e4b5feffd 100644
--- a/assets/scss/init/_variables.scss
+++ b/assets/scss/init/_variables.scss
@@ -11,7 +11,7 @@ $bolt-saturated: #003e7c; // Very saturated. Use with care
 $big-z-index: 1000;
 
 // Typography
-$font-family-base:            -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+$font-family-base:            system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
 $headings-font-family:        'Source Sans Variable', sans-serif;
 
 $font-size-base:              0.9rem;
diff --git a/public/theme/skeleton/css/new.css b/public/theme/skeleton/css/new.css
index cfc8bf8f4..b13911a7b 100644
--- a/public/theme/skeleton/css/new.css
+++ b/public/theme/skeleton/css/new.css
@@ -1,7 +1,7 @@
 /* New.css 1.1.3 from https://newcss.net */
 
 :root {
-    --nc-font-sans: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+    --nc-font-sans: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
     --nc-font-mono: Consolas, monaco, 'Ubuntu Mono', 'Liberation Mono', 'Courier New', Courier, monospace;
     --nc-tx-1: #000000;
     --nc-tx-2: #1A1A1A;
diff --git a/templates/_partials/notification.html.twig b/templates/_partials/notification.html.twig
index fba7a5514..046dfeaf1 100644
--- a/templates/_partials/notification.html.twig
+++ b/templates/_partials/notification.html.twig
@@ -49,7 +49,7 @@
         border: none;
         border-left-width: 5px !important;
         border-left-style: solid !important;
-        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
+        font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !important;
         font-size: 16px !important;
         padding: 1rem !important;
         margin: 1rem 0 !important;