From a99e3c19803eb108a14583b230fa43f3f484f0d4 Mon Sep 17 00:00:00 2001 From: sonny Date: Wed, 3 Jun 2020 20:10:19 +0200 Subject: [PATCH] Move font files outside sass folder --- src/newsreader/{scss => assets}/fonts/METADATA.pb | 0 .../{scss => assets}/fonts/Rubik-Black.ttf | Bin .../{scss => assets}/fonts/Rubik-BlackItalic.ttf | Bin .../{scss => assets}/fonts/Rubik-Bold.ttf | Bin .../{scss => assets}/fonts/Rubik-BoldItalic.ttf | Bin .../{scss => assets}/fonts/Rubik-Italic.ttf | Bin .../{scss => assets}/fonts/Rubik-Light.ttf | Bin .../{scss => assets}/fonts/Rubik-LightItalic.ttf | Bin .../{scss => assets}/fonts/Rubik-Medium.ttf | Bin .../{scss => assets}/fonts/Rubik-MediumItalic.ttf | Bin .../{scss => assets}/fonts/Rubik-Regular.ttf | Bin src/newsreader/scss/index.scss | 1 - .../scss/{fonts/index.scss => partials/_fonts.scss} | 4 ++-- src/newsreader/scss/partials/index.scss | 1 + 14 files changed, 3 insertions(+), 3 deletions(-) rename src/newsreader/{scss => assets}/fonts/METADATA.pb (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-Black.ttf (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-BlackItalic.ttf (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-Bold.ttf (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-BoldItalic.ttf (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-Italic.ttf (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-Light.ttf (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-LightItalic.ttf (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-Medium.ttf (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-MediumItalic.ttf (100%) rename src/newsreader/{scss => assets}/fonts/Rubik-Regular.ttf (100%) rename src/newsreader/scss/{fonts/index.scss => partials/_fonts.scss} (50%) diff --git a/src/newsreader/scss/fonts/METADATA.pb b/src/newsreader/assets/fonts/METADATA.pb similarity index 100% rename from src/newsreader/scss/fonts/METADATA.pb rename to src/newsreader/assets/fonts/METADATA.pb diff --git a/src/newsreader/scss/fonts/Rubik-Black.ttf b/src/newsreader/assets/fonts/Rubik-Black.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-Black.ttf rename to src/newsreader/assets/fonts/Rubik-Black.ttf diff --git a/src/newsreader/scss/fonts/Rubik-BlackItalic.ttf b/src/newsreader/assets/fonts/Rubik-BlackItalic.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-BlackItalic.ttf rename to src/newsreader/assets/fonts/Rubik-BlackItalic.ttf diff --git a/src/newsreader/scss/fonts/Rubik-Bold.ttf b/src/newsreader/assets/fonts/Rubik-Bold.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-Bold.ttf rename to src/newsreader/assets/fonts/Rubik-Bold.ttf diff --git a/src/newsreader/scss/fonts/Rubik-BoldItalic.ttf b/src/newsreader/assets/fonts/Rubik-BoldItalic.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-BoldItalic.ttf rename to src/newsreader/assets/fonts/Rubik-BoldItalic.ttf diff --git a/src/newsreader/scss/fonts/Rubik-Italic.ttf b/src/newsreader/assets/fonts/Rubik-Italic.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-Italic.ttf rename to src/newsreader/assets/fonts/Rubik-Italic.ttf diff --git a/src/newsreader/scss/fonts/Rubik-Light.ttf b/src/newsreader/assets/fonts/Rubik-Light.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-Light.ttf rename to src/newsreader/assets/fonts/Rubik-Light.ttf diff --git a/src/newsreader/scss/fonts/Rubik-LightItalic.ttf b/src/newsreader/assets/fonts/Rubik-LightItalic.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-LightItalic.ttf rename to src/newsreader/assets/fonts/Rubik-LightItalic.ttf diff --git a/src/newsreader/scss/fonts/Rubik-Medium.ttf b/src/newsreader/assets/fonts/Rubik-Medium.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-Medium.ttf rename to src/newsreader/assets/fonts/Rubik-Medium.ttf diff --git a/src/newsreader/scss/fonts/Rubik-MediumItalic.ttf b/src/newsreader/assets/fonts/Rubik-MediumItalic.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-MediumItalic.ttf rename to src/newsreader/assets/fonts/Rubik-MediumItalic.ttf diff --git a/src/newsreader/scss/fonts/Rubik-Regular.ttf b/src/newsreader/assets/fonts/Rubik-Regular.ttf similarity index 100% rename from src/newsreader/scss/fonts/Rubik-Regular.ttf rename to src/newsreader/assets/fonts/Rubik-Regular.ttf diff --git a/src/newsreader/scss/index.scss b/src/newsreader/scss/index.scss index e91c38f..6bd9025 100644 --- a/src/newsreader/scss/index.scss +++ b/src/newsreader/scss/index.scss @@ -1,6 +1,5 @@ @import './lib/index'; @import './partials/index'; -@import './fonts/index'; @import './components/index'; @import './elements/index'; diff --git a/src/newsreader/scss/fonts/index.scss b/src/newsreader/scss/partials/_fonts.scss similarity index 50% rename from src/newsreader/scss/fonts/index.scss rename to src/newsreader/scss/partials/_fonts.scss index c65f3c3..bcceb13 100644 --- a/src/newsreader/scss/fonts/index.scss +++ b/src/newsreader/scss/partials/_fonts.scss @@ -1,10 +1,10 @@ @font-face { font-family: Rubik; - src: url('./fonts/Rubik-Regular.ttf'); + src: url('../assets/fonts/Rubik-Regular.ttf'); } @font-face { font-family: Rubik; - src: url('./fonts/Rubik-Bold.ttf'); + src: url('../assets/fonts/Rubik-Bold.ttf'); font-weight: bold; } diff --git a/src/newsreader/scss/partials/index.scss b/src/newsreader/scss/partials/index.scss index ff39a55..ff28d1b 100644 --- a/src/newsreader/scss/partials/index.scss +++ b/src/newsreader/scss/partials/index.scss @@ -1 +1,2 @@ @import './colors'; +@import './fonts';