Merge pull request #2004 from bolt/fix/font-stack

Updating the system font stack for 2020
bolt · Oct 15, 2020 · 1296898 · 1296898
2 parents ec03584 + 1b86721
commit 1296898
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;