Merge pull request #10 from janhq/fix/font-serif

fix change font serif
janhq · Jul 17, 2024 · b67ad77 · b67ad77
2 parents 8d00eab + 5e038ed
commit b67ad77
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 1 deletion.
diff --git a/public/assets/fonts/PPEditorialNew-Regular.otf b/public/assets/fonts/PPEditorialNew-Regular.otf
diff --git a/public/assets/fonts/PPEditorialNew-RegularItalic.otf b/public/assets/fonts/PPEditorialNew-RegularItalic.otf
diff --git a/public/assets/fonts/PPEditorialNew-Ultrabold.otf b/public/assets/fonts/PPEditorialNew-Ultrabold.otf
diff --git a/public/assets/fonts/PPEditorialNew-UltraboldItalic.otf b/public/assets/fonts/PPEditorialNew-UltraboldItalic.otf
diff --git a/public/assets/fonts/PPEditorialNew-Ultralight.otf b/public/assets/fonts/PPEditorialNew-Ultralight.otf
diff --git a/public/assets/fonts/PPEditorialNew-UltralightItalic.otf b/public/assets/fonts/PPEditorialNew-UltralightItalic.otf
diff --git a/src/styles/fonts.scss b/src/styles/fonts.scss
@@ -0,0 +1,46 @@
+@import url('https://fonts.googleapis.com/css2?family=Inter:[email protected]&display=swap');
+
+@font-face {
+  font-family: 'PPEditorialNew';
+  src: url('../../public/assets/fonts/PPEditorialNew-Regular.otf')
+    format('opentype');
+  font-weight: 400;
+}
+
+@font-face {
+  font-family: 'PPEditorialNew';
+  src: url('../../public/assets/fonts/PPEditorialNew-RegularItalic.otf')
+    format('opentype');
+  font-weight: 400;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'PPEditorialNew';
+  src: url('../../public/assets/fonts/PPEditorialNew-Ultrabold.otf')
+    format('opentype');
+  font-weight: 700;
+}
+
+@font-face {
+  font-family: 'PPEditorialNew';
+  src: url('../../public/assets/fonts/PPEditorialNew-UltraboldItalic.otf')
+    format('opentype');
+  font-weight: 700;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'PPEditorialNew';
+  src: url('../../public/assets/fonts/PPEditorialNew-Ultralight.otf')
+    format('opentype');
+  font-weight: 300;
+}
+
+@font-face {
+  font-family: 'PPEditorialNew';
+  src: url('../../public/assets/fonts/PPEditorialNew-UltralightItalic.otf')
+    format('opentype');
+  font-weight: 300;
+  font-style: italic;
+}
diff --git a/src/styles/main.scss b/src/styles/main.scss
@@ -3,6 +3,7 @@
 @import "tailwindcss/utilities";
 
 @import "./general.scss";
+@import "./fonts.scss";
 
 .logo-mobile {
   display: flex;

diff --git a/tailwind.config.ts b/tailwind.config.ts
@@ -27,7 +27,7 @@ const config: Config = {
         "sans-serif",
       ],
       serif: [
-        "ui-serif",
+        "PPEditorialNew",
         "Georgia",
         "Cambria",
         "Times New Roman",