Merge pull request #17 from GreenB0t/main

Fix Twemoji font load order and improve fallback logic

Author: 7w1

themes/blue-nord.sable.css

@@ -5,7 +5,7 @@ name: Blue Nord
 author: userspring
 kind: dark
 contrast: low
-tags: dark, grey, nord, blue
+tags: nord, grey, blue
 fullThemeUrl: https://raw.githubusercontent.com/SableClient/themes/main/themes/blue-nord.sable.css
 */
 

themes/shark-deep-blue.sable.css

@@ -5,7 +5,7 @@ name: Shark Deep Blue
 author: userspring
 kind: dark
 contrast: low
-tags: dark, ocean, red bleed
+tags: ocean, red bleed
 fullThemeUrl: https://raw.githubusercontent.com/SableClient/themes/main/themes/shark-deep-blue.sable.css
 */
 
@@ -44,15 +44,8 @@ fullThemeUrl: https://raw.githubusercontent.com/SableClient/themes/main/themes/s
   font-display: swap;
 }
 
-@font-face {
-  font-family: 'Twemoji';
-  src: url('https://raw.githubusercontent.com/SableClient/Sable/dev/public/font/Twemoji.Mozilla.v15.1.0.woff2') format('woff2'),
-       url('https://raw.githubusercontent.com/SableClient/Sable/dev/public/font/Twemoji.Mozilla.v15.1.0.ttf') format('truetype');
-  font-display: swap;
-}
-
 body.sable-remote-theme {
-  font-family: 'Rajdhani', serif, 'Twemoji', system-ui;
+  font-family: 'Rajdhani', 'Twemoji', 'Nunito Variable', system-ui, -apple-system, sans-serif;
 
   /* --- Background --- */
   --sable-bg-container: hsl(207, 34.72%, 12.56%);

tweaks/clear-sable-font.sable.css

@@ -2,12 +2,12 @@
 @sable-tweak
 id: clear-sable-font
 name: Clear Sable Font
-description: Use default system/browser font.
+description: Use default system/browser font
 author: userspring
 tags: global, font
 */
 
 body.sable-remote-theme,
 body.sable-remote-theme * {
-  font-family: system-ui, Twemoji, -apple-system, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif !important;
+  font-family: 'Twemoji', system-ui, -apple-system, sans-serif !important;
 }

tweaks/clear-theme-font.sable.css

@@ -2,12 +2,12 @@
 @sable-tweak
 id: clear-theme-font
 name: Clear Theme Font
-description: Remove custom theme font where applicable.
+description: Remove custom theme font where applicable
 author: userspring
 tags: global, font
 */
 
 body.sable-remote-theme,
 body.sable-remote-theme * {
-  font-family: Nunito Variable, system-ui, Twemoji, -apple-system, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif !important;
+  font-family: 'Nunito Variable', 'Twemoji', system-ui, -apple-system, sans-serif !important;
 }