Merge pull request #589 from Adamant-im/feat/font-Fallback

Feat/font fallback
Adamant-im · Jan 24, 2024 · 9450334 · 9450334
2 parents 8cf60aa + 6d21b5a
commit 9450334
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 388 deletions.
diff --git a/index.html b/index.html
@@ -43,7 +43,7 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="#4A4A4A">
     <meta name="apple-mobile-web-app-title" content="ADAMANT Messenger">
 
-    <link rel="stylesheet" href="/fonts/Exo+2.css">
+
   </head>
 
   <body style="background: repeating-linear-gradient(140deg, #191919, #191919 0.7px, #212121 0, #212121 5px);">

diff --git a/public/fonts/Exo+2.css b/public/fonts/Exo+2.css
diff --git a/public/fonts/Exo+2_100_normal.ttf b/public/fonts/Exo+2_100_normal.ttf
diff --git a/public/fonts/Exo+2_100_normal.woff b/public/fonts/Exo+2_100_normal.woff
diff --git a/public/fonts/Exo+2_300_normal.ttf b/public/fonts/Exo+2_300_normal.ttf
diff --git a/public/fonts/Exo+2_300_normal.woff b/public/fonts/Exo+2_300_normal.woff
diff --git a/public/fonts/Exo+2_400_italic.ttf b/public/fonts/Exo+2_400_italic.ttf
diff --git a/public/fonts/Exo+2_400_italic.woff b/public/fonts/Exo+2_400_italic.woff
diff --git a/public/fonts/Exo+2_400_normal.svg b/public/fonts/Exo+2_400_normal.svg
diff --git a/public/fonts/Exo+2_400_normal.ttf b/public/fonts/Exo+2_400_normal.ttf
diff --git a/public/fonts/Exo+2_400_normal.woff b/public/fonts/Exo+2_400_normal.woff
diff --git a/public/fonts/Exo+2_500_normal.ttf b/public/fonts/Exo+2_500_normal.ttf
diff --git a/public/fonts/Exo+2_500_normal.woff b/public/fonts/Exo+2_500_normal.woff
diff --git a/public/fonts/Exo+2_700_normal.ttf b/public/fonts/Exo+2_700_normal.ttf
diff --git a/public/fonts/Exo+2_700_normal.woff b/public/fonts/Exo+2_700_normal.woff
diff --git a/src/assets/styles/generic/_vuetify.scss b/src/assets/styles/generic/_vuetify.scss
@@ -1,7 +1,8 @@
 @import 'vuetify/settings';
 @import '../settings/_colors.scss';
 
-$font-family: 'Exo 2', sans-serif;
+$font-family: -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue',
+  Arial, sans-serif;
 
 html {
   font-family: $font-family;

diff --git a/src/views/Login.vue b/src/views/Login.vue
@@ -196,14 +196,16 @@ export default defineComponent({
   height: 100%;
 
   &__title {
-    font-family: 'Exo 2';
+    font-family: -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue',
+      Arial, sans-serif;
     font-weight: 100;
     font-size: 40px;
     line-height: 40px;
     text-transform: uppercase;
   }
   &__subtitle {
-    font-family: 'Exo 2';
+    font-family: -apple-system, system-ui, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue',
+      Arial, sans-serif;
     font-weight: 100;
     font-size: 18px;
   }