From d63d7437a8000a8cd4d9ed616d5b1458537f3600 Mon Sep 17 00:00:00 2001 From: Settel Date: Thu, 12 Aug 2021 23:42:43 +0200 Subject: [PATCH] moved font definition to global asset file --- client/nuxt.config.js | 4 ++++ client/src/assets/css/base.scss | 12 ++++++++++ client/src/assets/css/fonts.scss | 25 ++++++++++++++++++++ client/src/layouts/default.vue | 40 -------------------------------- 4 files changed, 41 insertions(+), 40 deletions(-) create mode 100644 client/src/assets/css/base.scss create mode 100644 client/src/assets/css/fonts.scss diff --git a/client/nuxt.config.js b/client/nuxt.config.js index 8d9660f..6a9a49e 100644 --- a/client/nuxt.config.js +++ b/client/nuxt.config.js @@ -12,6 +12,10 @@ export default { { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' } ] }, + css: [ + '@/assets/css/fonts', + '@/assets/css/base', + ], components: true, modules: ['@nuxtjs/axios'], plugins: [{ src: '~/plugins/engine.js', mode: 'client' }], diff --git a/client/src/assets/css/base.scss b/client/src/assets/css/base.scss new file mode 100644 index 0000000..8a33322 --- /dev/null +++ b/client/src/assets/css/base.scss @@ -0,0 +1,12 @@ +html, body { + margin: 0; + padding: 0; +} + +body { + background-color: #402080; +} + +a { + text-decoration: none; +} diff --git a/client/src/assets/css/fonts.scss b/client/src/assets/css/fonts.scss new file mode 100644 index 0000000..901cd74 --- /dev/null +++ b/client/src/assets/css/fonts.scss @@ -0,0 +1,25 @@ +@font-face { + font-family: 'Wendy One'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(/fonts/wendy-one/WendyOne-Regular.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: url(/fonts/dosis/dosis-300.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 800; + font-display: swap; + src: url(/fonts/dosis/dosis-800.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/client/src/layouts/default.vue b/client/src/layouts/default.vue index aaf04a5..50bb506 100644 --- a/client/src/layouts/default.vue +++ b/client/src/layouts/default.vue @@ -3,43 +3,3 @@ - -