fix: fuck twemoji

Zephyruso · Dec 6, 2024 · ace9d13 · ace9d13
1 parent af7a1e9
commit ace9d13
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -19,7 +19,7 @@ onMounted(() => {
 <template>
   <div
     ref="app"
-    class="flex h-dvh w-screen overflow-x-hidden bg-base-100 font-twemoji"
+    class="font-twemoji flex h-dvh w-screen overflow-x-hidden bg-base-100"
     :data-theme="theme"
   >
     <SetupPage v-if="!activeBackend"></SetupPage>

diff --git a/src/assets/FiraSans-Regular.ttf b/src/assets/FiraSans-Regular.ttf
diff --git a/src/assets/FiraSans-Regular.woff2 b/src/assets/FiraSans-Regular.woff2
diff --git a/src/assets/NotoColorEmoji-flagsonly.ttf b/src/assets/NotoColorEmoji-flagsonly.ttf
diff --git a/src/assets/Twemoji.Mozilla.ttf b/src/assets/Twemoji.Mozilla.ttf
diff --git a/src/assets/main.css b/src/assets/main.css
@@ -3,12 +3,15 @@
 @tailwind utilities;
 
 @font-face {
-  font-family: 'Twemoji Mozilla';
-  src: url('./Twemoji.Mozilla.ttf') format('truetype');
+  font-family: 'NotoEmoji';
+  src: url('./NotoColorEmoji-flagsonly.ttf') format('truetype');
 }
 
 @font-face {
   font-family: 'Fira Sans';
-  src: url('./FiraSans-Regular.woff2') format('woff2');
-  font-display: swap;
+  src: url('./FiraSans-Regular.ttf') format('truetype');
+}
+
+:root {
+  font-family: 'Fira Sans', 'NotoEmoji', 'system-ui';
 }
diff --git a/src/components/proxies/ProxyNodeCard.vue b/src/components/proxies/ProxyNodeCard.vue
@@ -2,8 +2,8 @@
   <div
     :class="
       twMerge(
-        'flex cursor-pointer flex-wrap items-center justify-end gap-1 rounded-md bg-base-200 p-2 shadow-md transition sm:hover:scale-105',
-        props.active && 'bg-primary text-primary-content',
+        'flex cursor-pointer flex-wrap items-center justify-end gap-1 rounded-md bg-base-200 p-2 shadow-md sm:hover:scale-105',
+        active && 'bg-primary text-primary-content',
         truncateProxyName && isTruncated && 'tooltip text-left',
       )
     "

diff --git a/tailwind.config.ts b/tailwind.config.ts
@@ -14,11 +14,6 @@ export default {
       'xl': '1280px',
       '2xl': '1536px',
       '3xl': '1800px',
-    },
-    extend: {
-      fontFamily: {
-        twemoji: ['Fira Sans', 'Twemoji Mozilla', 'system-ui'],
-      },
     }
   },
   daisyui: {