From ba70d436d0f1e11baa9e8c51cc72de48a05eac36 Mon Sep 17 00:00:00 2001 From: westtle <103447524+westtle@users.noreply.github.com> Date: Sun, 11 Feb 2024 21:47:17 +0700 Subject: [PATCH] moved fonts.css content to global.css --- assets/styles/fonts.css | 25 ------------------------- assets/styles/global.css | 26 ++++++++++++++++++++++++++ index.html | 1 - 3 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 assets/styles/fonts.css diff --git a/assets/styles/fonts.css b/assets/styles/fonts.css deleted file mode 100644 index 2fc42bc..0000000 --- a/assets/styles/fonts.css +++ /dev/null @@ -1,25 +0,0 @@ -@font-face { - font-display: swap; - font-family: Roboto; - font-style: normal; - font-weight: 400; - src: url("../fonts/roboto/roboto-400.eot"); - src: url("../fonts/roboto/roboto-400.eot?#iefix") format("embedded-opentype"), - url("../fonts/roboto/roboto-400.woff2") format("woff2"), - url("../fonts/roboto/roboto-400.woff") format("woff"), - url("../fonts/roboto/roboto-400.ttf") format("truetype"), - url("../fonts/roboto/roboto-400.svg#Roboto") format("svg"); -} - -@font-face { - font-display: swap; - font-family: "Roboto Slab"; - font-style: normal; - font-weight: 500; - src: url("../fonts/roboto-slab/roboto-slab-500"); - src: url("../fonts/roboto-slab/roboto-slab-500?#iefix") format("embedded-opentype"), - url("../fonts/roboto-slab/roboto-slab-500.woff2") format("woff2"), - url("../fonts/roboto-slab/roboto-slab-500.woff") format("woff"), - url("../fonts/roboto-slab/roboto-slab-500.ttf") format("truetype"), - url("../fonts/roboto-slab/roboto-slab-500.svg#RobotoSlab") format("svg"); -} \ No newline at end of file diff --git a/assets/styles/global.css b/assets/styles/global.css index e70be1e..0d2c5fc 100644 --- a/assets/styles/global.css +++ b/assets/styles/global.css @@ -1,3 +1,29 @@ +@font-face { + font-display: swap; + font-family: Roboto; + font-style: normal; + font-weight: 400; + src: url("../fonts/roboto/roboto-400.eot"); + src: url("../fonts/roboto/roboto-400.eot?#iefix") format("embedded-opentype"), + url("../fonts/roboto/roboto-400.woff2") format("woff2"), + url("../fonts/roboto/roboto-400.woff") format("woff"), + url("../fonts/roboto/roboto-400.ttf") format("truetype"), + url("../fonts/roboto/roboto-400.svg#Roboto") format("svg"); +} + +@font-face { + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; + font-weight: 500; + src: url("../fonts/roboto-slab/roboto-slab-500"); + src: url("../fonts/roboto-slab/roboto-slab-500?#iefix") format("embedded-opentype"), + url("../fonts/roboto-slab/roboto-slab-500.woff2") format("woff2"), + url("../fonts/roboto-slab/roboto-slab-500.woff") format("woff"), + url("../fonts/roboto-slab/roboto-slab-500.ttf") format("truetype"), + url("../fonts/roboto-slab/roboto-slab-500.svg#RobotoSlab") format("svg"); +} + :root { /* Fonts */ --font-roboto: Roboto, sans-serif; diff --git a/index.html b/index.html index d2816fd..25bde01 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,6 @@ -