From 6debee64a08f04a54ec6ca404a141c5444efdd29 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 29 Nov 2023 00:45:38 +0000 Subject: [PATCH] style(frontend): use local FRADrive Sans in application --- frontend/src/_common.sass | 52 ++++++++++++++++++++++++++++----------- frontend/src/app.sass | 8 +++--- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/frontend/src/_common.sass b/frontend/src/_common.sass index e05dc6935..bbc3031d5 100644 --- a/frontend/src/_common.sass +++ b/frontend/src/_common.sass @@ -9,22 +9,44 @@ @use "~@fortawesome/fontawesome-pro/scss/solid" -// @use "~typeface-roboto" as roboto -// @use "~typeface-source-sans-pro" as source-sans-pro -// @use "~typeface-source-code-pro" as source-code-pro @font-face - src: url("../../assets/fonts/StoneSansFraportII-Md.woff2") format("woff2") - font-family: "Stone Sans Fraport II Medium" - font-weight: 100 + font-family: "FRADrive Sans" + src: url('./../../assets/fonts/fradrive/FRADriveSans-Regular.woff2') format('woff2'), url('./../../assets/fonts/fradrive/FRADriveSans-Regular.woff') format('woff') + font-weight: 100 500 + font-style: normal @font-face - src: url("../../assets/fonts/StoneSansFraportII-MdIt.woff2") format("woff2") - font-family: "Stone Sans Fraport II Medium Italic" - font-weight: 100 + font-family: "FRADrive Sans" + src: url('./../../assets/fonts/fradrive/FRADriveSans-Italic.woff2') format('woff2'), url('./../../assets/fonts/fradrive/FRADriveSans-Italic.woff') format('woff') + font-weight: 100 500 + font-style: italic @font-face - src: url("../../assets/fonts/StoneSansFraportII-SmBd.woff2") format("woff2") - font-family: "Stone Sans Fraport II Semibold" - font-weight: 100 + font-family: "FRADrive Sans" + src: url('./../../assets/fonts/fradrive/FRADriveSans-Bold.woff2') format('woff2'), url('./../../assets/fonts/fradrive/FRADriveSans-Bold.woff') format('woff') + font-weight: 600 1000 + font-style: normal @font-face - src: url("../../assets/fonts/StoneSansFraportII-SmBdIt.woff2") format("woff2") - font-family: "Stone Sans Fraport II Semibold Italic" - font-weight: 100 + font-family: "FRADrive Sans" + src: url('./../../assets/fonts/fradrive/FRADriveSans-BoldItalic.woff2') format('woff2'), url('./../../assets/fonts/fradrive/FRADriveSans-BoldItalic.woff') format('woff') + font-weight: 600 1000 + font-style: italic + +@font-face + font-family: "FRADrive Mono" + src: url('./../../assets/fonts/fradrive/FRADriveMono-Regular.woff2') format('woff2'), url('./../../assets/fonts/fradrive/FRADriveMono-Regular.woff') format('woff') + font-weight: 100 500 + font-style: normal +@font-face + font-family: "FRADrive Mono" + src: url('./../../assets/fonts/fradrive/FRADriveMono-Italic.woff2') format('woff2'), url('./../../assets/fonts/fradrive/FRADriveMono-Italic.woff') format('woff') + font-weight: 100 500 + font-style: italic +@font-face + font-family: "FRADrive Mono" + src: url('./../../assets/fonts/fradrive/FRADriveMono-Bold.woff2') format('woff2'), url('./../../assets/fonts/fradrive/FRADriveMono-Bold.woff') format('woff') + font-weight: 600 1000 + font-style: normal +@font-face + font-family: "FRADrive Mono" + src: url('./../../assets/fonts/fradrive/FRADriveMono-BoldItalic.woff2') format('woff2'), url('./../../assets/fonts/fradrive/FRADriveMono-BoldItalic.woff') format('woff') + font-weight: 600 1000 + font-style: italic diff --git a/frontend/src/app.sass b/frontend/src/app.sass index 3c4a2d0aa..a7024e2dc 100644 --- a/frontend/src/app.sass +++ b/frontend/src/app.sass @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 Gregor Kleen ,Sarah Vaupel ,Sarah Vaupel ,Steffen Jost ,Wolfgang Witt +// SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen ,Sarah Vaupel ,Sarah Vaupel ,Steffen Jost ,Wolfgang Witt // // SPDX-License-Identifier: AGPL-3.0-or-later // SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design @@ -27,9 +27,9 @@ --color-fontsec: #5b5861 // FONTS - --font-base: "Stone Sans Fraport II Medium", sans-serif - --font-logo: "Stone Sans Fraport II Semibold", var(--font-base) - --font-monospace: "Source Code Pro", monospace + --font-base: 'FRADrive Sans', sans-serif + --font-logo: var(--font-base) + --font-monospace: 'FRADrive Mono', monospace // DIMENSIONS --header-height: 100px