From e114de917d5dbe77e88a24f51fff4a8b1033a9b9 Mon Sep 17 00:00:00 2001 From: Jakob Steiner Date: Mon, 25 Nov 2024 08:26:33 +0000 Subject: [PATCH] chore: add missing fonts (#21) Signed-off-by: Jakob Steiner --- .../src/app/components/nav-bar/nav-bar.component.html | 2 +- frontend/cloud-ui/src/styles.scss | 8 ++++---- package-lock.json | 7 +++++++ package.json | 1 + tailwind.config.js | 4 ++++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/frontend/cloud-ui/src/app/components/nav-bar/nav-bar.component.html b/frontend/cloud-ui/src/app/components/nav-bar/nav-bar.component.html index 20aa3a34..0f8a6a1f 100644 --- a/frontend/cloud-ui/src/app/components/nav-bar/nav-bar.component.html +++ b/frontend/cloud-ui/src/app/components/nav-bar/nav-bar.component.html @@ -23,7 +23,7 @@ Glasskube Logo -

+

Glasskube

diff --git a/frontend/cloud-ui/src/styles.scss b/frontend/cloud-ui/src/styles.scss index 2460219f..c0909bdb 100644 --- a/frontend/cloud-ui/src/styles.scss +++ b/frontend/cloud-ui/src/styles.scss @@ -3,8 +3,8 @@ @tailwind components; @tailwind utilities; +@import '@fontsource/inter/latin-300.css'; +@import '@fontsource/inter/latin-400.css'; +@import '@fontsource/inter/latin-600.css'; +@import '@fontsource/inter/latin-700.css'; @import '@fontsource/poppins/latin-600.css'; - -.font-poppins { - font-family: Poppins, Inter, system-ui, sans-serif; -} diff --git a/package-lock.json b/package-lock.json index 3e66deb8..c45aa06f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "@angular/platform-browser": "^19.0.0", "@angular/platform-browser-dynamic": "^19.0.0", "@angular/router": "^19.0.0", + "@fontsource/inter": "^5.1.0", "@fontsource/poppins": "^5.1.0", "flowbite": "^2.5.2", "posthog-js": "^1.187.0", @@ -2900,6 +2901,12 @@ "node": ">=18" } }, + "node_modules/@fontsource/inter": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.1.0.tgz", + "integrity": "sha512-zKZR3kf1G0noIes1frLfOHP5EXVVm0M7sV/l9f/AaYf+M/DId35FO4LkigWjqWYjTJZGgplhdv4cB+ssvCqr5A==", + "license": "OFL-1.1" + }, "node_modules/@fontsource/poppins": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@fontsource/poppins/-/poppins-5.1.0.tgz", diff --git a/package.json b/package.json index 2796aa2a..e5924b9d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "@angular/platform-browser": "^19.0.0", "@angular/platform-browser-dynamic": "^19.0.0", "@angular/router": "^19.0.0", + "@fontsource/inter": "^5.1.0", "@fontsource/poppins": "^5.1.0", "flowbite": "^2.5.2", "posthog-js": "^1.187.0", diff --git a/tailwind.config.js b/tailwind.config.js index f34eaf11..84fc5363 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,6 +3,10 @@ module.exports = { content: ['./frontend/cloud-ui/src/**/*.{html,ts}', './frontend/cloud-ui/node_modules/flowbite/**/*.js'], theme: { extend: {}, + fontFamily: { + sans: ['Inter', 'system-ui', 'sans-serif'], + display: ['Poppins', 'Inter', 'system-ui', 'sans-serif'], + }, }, plugins: [require('flowbite/plugin')], };