Improve Fonts Load

rn0x · Mar 15, 2023 · 15ba0f7 · 15ba0f7
1 parent 97c0cf0
commit 15ba0f7
Show file tree

Hide file tree

Showing 23 changed files with 54 additions and 57 deletions.
diff --git a/src/pages/adhkar.html b/src/pages/adhkar.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/adhkar.css">

diff --git a/src/pages/adhkar/evening.html b/src/pages/adhkar/evening.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../../public/css/barWindow.css">
     <link rel="stylesheet" href="../../public/css/pages_adhkar.css">

diff --git a/src/pages/adhkar/food.html b/src/pages/adhkar/food.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../../public/css/barWindow.css">
     <link rel="stylesheet" href="../../public/css/pages_adhkar.css">

diff --git a/src/pages/adhkar/morning.html b/src/pages/adhkar/morning.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../../public/css/barWindow.css">
     <link rel="stylesheet" href="../../public/css/pages_adhkar.css">

diff --git a/src/pages/adhkar/prayer.html b/src/pages/adhkar/prayer.html
@@ -6,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" id="variables_css">
+    <link rel="stylesheet" href="../../public/css/fonts.css">
     <link rel="stylesheet" href="../../public/css/barWindow.css">
     <link rel="stylesheet" href="../../public/css/pages_adhkar.css">
     <link rel="stylesheet" href="../../public/css/animate.min.css">

diff --git a/src/pages/adhkar/sleeping.html b/src/pages/adhkar/sleeping.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../../public/css/barWindow.css">
     <link rel="stylesheet" href="../../public/css/pages_adhkar.css">

diff --git a/src/pages/adhkar/tasbih.html b/src/pages/adhkar/tasbih.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../../public/css/barWindow.css">
     <link rel="stylesheet" href="../../public/css/pages_adhkar.css">

diff --git a/src/pages/audio_window.html b/src/pages/audio_window.html
@@ -2,6 +2,7 @@
 <html lang="en">
 
 <head>
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/audio_window.css">

diff --git a/src/pages/hisnmuslim.html b/src/pages/hisnmuslim.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/hisnmuslim.css">

diff --git a/src/pages/home.html b/src/pages/home.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/home.css">

diff --git a/src/pages/info.html b/src/pages/info.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/info.css">

diff --git a/src/pages/prayer_time.html b/src/pages/prayer_time.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/prayer_time.css">

diff --git a/src/pages/quran.html b/src/pages/quran.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/surah.css">

diff --git a/src/pages/quran_mp3.html b/src/pages/quran_mp3.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/quran_mp3.css">

diff --git a/src/pages/settings.html b/src/pages/settings.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/settings.css">

diff --git a/src/pages/surah.html b/src/pages/surah.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/barWindow.css">
     <link rel="stylesheet" href="../public/css/surah.css">

diff --git a/src/pages/tray_window.html b/src/pages/tray_window.html
@@ -3,6 +3,7 @@
 
 <head>
     <title>التقوى</title>
+    <link rel="stylesheet" href="../public/css/fonts.css">
     <link rel="stylesheet" id="variables_css">
     <link rel="stylesheet" href="../public/css/tray_window.css">
     <link rel="stylesheet" href="../public/css/animate.min.css">

diff --git a/src/preload/preload_modules/settings.js b/src/preload/preload_modules/settings.js
@@ -128,7 +128,7 @@ module.exports = function settings(fs, path, App_Path, settings, ipcRenderer) {
 
         if (lastVersion === version?.currentRelease) {
 
-            alert_settings_title.innerText = "انت على آخر إصدار من تطبيق التقوى"
+            alert_settings_title.innerText = "لديك بالفعل آخر إصدار من تطبيق التقوى"
             alert_settings_icon.src = "../public/icon/x.png"
             app_current_version.innerText = version?.currentRelease
             app_latest_version.innerText = lastVersion

diff --git a/src/public/css/audio_window.css b/src/public/css/audio_window.css
@@ -1,10 +1,3 @@
-@font-face {
-    font-family: "Vazirmatn-Regular";
-    src: url(../font/Vazirmatn-Regular.ttf) format("truetype");
-}
-
-
-
 html,
 body {
     background-color: var(--background_body);

diff --git a/src/public/css/barWindow.css b/src/public/css/barWindow.css
@@ -1,33 +1,3 @@
-@font-face {
-    font-family: "Vazirmatn-Bold";
-    src: url(../font/Vazirmatn-Bold.ttf) format("truetype");
-}
-
-@font-face {
-    font-family: "Vazirmatn-ExtraLight";
-    src: url(../font/Vazirmatn-ExtraLight.ttf) format("truetype");
-}
-
-@font-face {
-    font-family: "Vazirmatn-Medium";
-    src: url(../font/Vazirmatn-Medium.ttf) format("truetype");
-}
-
-@font-face {
-    font-family: "Vazirmatn-Regular";
-    src: url(../font/Vazirmatn-Regular.ttf) format("truetype");
-}
-
-@font-face {
-    font-family: "Quran";
-    src: url(../font/Quran.ttf) format("truetype");
-}
-
-@font-face {
-    font-family: "Quran_Bold";
-    src: url(../font/Quran_Bold.ttf) format("truetype");
-}
-
 html,
 body {
     background-color: var(--background_body);

diff --git a/src/public/css/fonts.css b/src/public/css/fonts.css
@@ -0,0 +1,36 @@
+:root {
+  --font_default: "Vazirmatn-Regular";
+  --font_quran: "Quran";
+  --font_quran_bold: "Quran_Bold";
+  --font_1: "Vazirmatn-ExtraLight";
+}
+
+@font-face {
+    font-family: "Vazirmatn-Bold";
+    src: url(../font/Vazirmatn-Bold.ttf) format("truetype");
+}
+
+@font-face {
+    font-family: "Vazirmatn-ExtraLight";
+    src: url(../font/Vazirmatn-ExtraLight.ttf) format("truetype");
+}
+
+@font-face {
+    font-family: "Vazirmatn-Medium";
+    src: url(../font/Vazirmatn-Medium.ttf) format("truetype");
+}
+
+@font-face {
+    font-family: "Quran_Bold";
+    src: url(../font/Quran_Bold.ttf) format("truetype");
+}
+
+@font-face {
+    font-family: "Vazirmatn-Regular";
+    src: url(../font/Vazirmatn-Regular.ttf) format("truetype");
+}
+
+@font-face {
+    font-family: "Quran";
+    src: url(../font/Quran.ttf) format("truetype");
+}
diff --git a/src/public/css/tray_window.css b/src/public/css/tray_window.css
@@ -1,18 +1,3 @@
-@font-face {
-    font-family: "Vazirmatn-Regular";
-    src: url(../font/Vazirmatn-Regular.ttf) format("truetype");
-}
-
-@font-face {
-    font-family: "Vazirmatn-Bold";
-    src: url(../font/Vazirmatn-Bold.ttf) format("truetype");
-}
-
-@font-face {
-    font-family: "Quran";
-    src: url(../font/Quran.ttf) format("truetype");
-}
-
 html,
 body {
     background-color: #232527b9;

diff --git a/src/public/css/var.css b/src/public/css/var.css
@@ -1,8 +1,4 @@
 :root {
-    --font_default: "Vazirmatn-Regular";
-    --font_quran: "Quran";
-    --font_quran_bold: "Quran_Bold";
-    --font_1: "Vazirmatn-ExtraLight";
     --font_size_surah: 30px;
     --font_size_adhkar: 20px;
     --background_body: #2e3338;