From 9024f427d7ffb96b87b42a9e4035c1f5e786cce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <40151420+ldericher@users.noreply.github.com> Date: Wed, 14 Sep 2022 23:37:16 +0000 Subject: [PATCH] move stuff around --- ui/src/App.vue | 26 ------ ui/src/assets/fonts.css | 71 -------------- ui/src/main.ts | 15 +-- ui/src/{plugins => }/registerServiceWorker.ts | 0 ui/src/sass/fonts.scss | 93 +++++++++++++++++++ 5 files changed, 102 insertions(+), 103 deletions(-) delete mode 100644 ui/src/assets/fonts.css rename ui/src/{plugins => }/registerServiceWorker.ts (100%) create mode 100644 ui/src/sass/fonts.scss diff --git a/ui/src/App.vue b/ui/src/App.vue index 264416f..ff9a36b 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -41,29 +41,3 @@ export default class App extends Vue { private message_html = "
changeme
"; } - - diff --git a/ui/src/assets/fonts.css b/ui/src/assets/fonts.css deleted file mode 100644 index 8c832b3..0000000 --- a/ui/src/assets/fonts.css +++ /dev/null @@ -1,71 +0,0 @@ -@font-face { - font-family: "Lubalin Graph"; - src: url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.eot"); - src: url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.eot?#iefix") format("embedded-opentype"), - url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.woff2") format("woff2"), - url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.woff") format("woff"), - url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.ttf") format("truetype"), - url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.svg#Lubalin BQ") format("svg"); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: "Lubalin Graph"; - src: url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.eot"); - src: url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.eot?#iefix") format("embedded-opentype"), - url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.woff2") format("woff2"), - url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.woff") format("woff"), - url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.ttf") format("truetype"), - url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.svg#LubalinGraph-Book") format("svg"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: "Neue Praxis"; - src: url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.eot"); - src: url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.eot?#iefix") format("embedded-opentype"), - url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.woff2") format("woff2"), - url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.woff") format("woff"), - url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.ttf") format("truetype"), - url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.svg#PraxisEF") format("svg"); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: "Neue Praxis"; - src: url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.eot"); - src: url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.eot?#iefix") format("embedded-opentype"), - url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.woff2") format("woff2"), - url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.woff") format("woff"), - url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.ttf") format("truetype"), - url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.svg#PraxisEF") format("svg"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: "Neue Demos"; - src: url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.eot"); - src: url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.eot?#iefix") format("embedded-opentype"), - url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.woff2") format("woff2"), - url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.woff") format("woff"), - url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.ttf") format("truetype"), - url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.svg#DemosEF") format("svg"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: "Neue Demos"; - src: url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.eot"); - src: url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.eot?#iefix") format("embedded-opentype"), - url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.woff2") format("woff2"), - url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.woff") format("woff"), - url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.ttf") format("truetype"), - url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.svg#DemosEF") format("svg"); - font-weight: normal; - font-style: italic; -} \ No newline at end of file diff --git a/ui/src/main.ts b/ui/src/main.ts index 41db596..8d61084 100644 --- a/ui/src/main.ts +++ b/ui/src/main.ts @@ -1,9 +1,12 @@ -import Vue from 'vue' -import App from './App.vue' -import axios from './plugins/axios' -import ovdashboard from './plugins/ovdashboard' -import './plugins/registerServiceWorker' -import vuetify from './plugins/vuetify' +import Vue from "vue" + +import "@/registerServiceWorker" +import "@/sass/fonts.scss" + +import App from "@/App.vue" +import axios from "@/plugins/axios" +import ovdashboard from "@/plugins/ovdashboard" +import vuetify from "@/plugins/vuetify" Vue.config.productionTip = false Vue.use(axios) diff --git a/ui/src/plugins/registerServiceWorker.ts b/ui/src/registerServiceWorker.ts similarity index 100% rename from ui/src/plugins/registerServiceWorker.ts rename to ui/src/registerServiceWorker.ts diff --git a/ui/src/sass/fonts.scss b/ui/src/sass/fonts.scss new file mode 100644 index 0000000..8c63643 --- /dev/null +++ b/ui/src/sass/fonts.scss @@ -0,0 +1,93 @@ +@font-face { + font-family: "Lubalin Graph"; + src: url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.eot"); + src: url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.eot?#iefix") format("embedded-opentype"), + url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.woff2") format("woff2"), + url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.woff") format("woff"), + url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.ttf") format("truetype"), + url("//db.onlinewebfonts.com/t/60eaf3171fce0c04eb9b3e08bba9bf05.svg#Lubalin BQ") format("svg"); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: "Lubalin Graph"; + src: url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.eot"); + src: url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.eot?#iefix") format("embedded-opentype"), + url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.woff2") format("woff2"), + url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.woff") format("woff"), + url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.ttf") format("truetype"), + url("//db.onlinewebfonts.com/t/ad42b6e73cbf720f172faa6355b69ec8.svg#LubalinGraph-Book") format("svg"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: "Neue Praxis"; + src: url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.eot"); + src: url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.eot?#iefix") format("embedded-opentype"), + url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.woff2") format("woff2"), + url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.woff") format("woff"), + url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.ttf") format("truetype"), + url("//db.onlinewebfonts.com/t/95d43d14f7d8f0f4692f507c86a29e25.svg#PraxisEF") format("svg"); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: "Neue Praxis"; + src: url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.eot"); + src: url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.eot?#iefix") format("embedded-opentype"), + url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.woff2") format("woff2"), + url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.woff") format("woff"), + url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.ttf") format("truetype"), + url("//db.onlinewebfonts.com/t/3d62d4fffdd20ba4608e1b29e0f6fb42.svg#PraxisEF") format("svg"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: "Neue Demos"; + src: url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.eot"); + src: url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.eot?#iefix") format("embedded-opentype"), + url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.woff2") format("woff2"), + url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.woff") format("woff"), + url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.ttf") format("truetype"), + url("//db.onlinewebfonts.com/t/57c19d4b8c4d1632fc97994508a35f5d.svg#DemosEF") format("svg"); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: "Neue Demos"; + src: url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.eot"); + src: url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.eot?#iefix") format("embedded-opentype"), + url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.woff2") format("woff2"), + url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.woff") format("woff"), + url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.ttf") format("truetype"), + url("//db.onlinewebfonts.com/t/ad75fa70682671bbf5a5cec5f6df1470.svg#DemosEF") format("svg"); + font-weight: normal; + font-style: italic; +} + +// THW Logo font +.thw-logo-font { + font-family: "Lubalin Graph", serif !important; + font-weight: bold !important; +} + +// THW Heading font +.thw-heading-font { + font-family: "Neue Praxis", "Roboto", sans-serif !important; +} + +// THW Text font +.thw-text-font { + font-family: "Neue Demos", serif !important; +} + +// THW Citation font +.thw-citation-font { + font-family: "Neue Demos", serif !important; + font-style: italic !important; +} \ No newline at end of file