From fb9b4560b37c31bdb78da62576ffbafb36806298 Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 15 Nov 2024 15:43:04 +0100 Subject: [PATCH] Fix a few classes and change fonts --- frontend/.browserlistrc | 6 ++++++ frontend/package-lock.json | 2 +- frontend/package.json | 1 + .../components/keyresult/keyresult.component.html | 2 +- frontend/src/assets/fonts/Roboto.scss | 12 ++++++------ frontend/src/style/styles.scss | 3 ++- 6 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 frontend/.browserlistrc diff --git a/frontend/.browserlistrc b/frontend/.browserlistrc new file mode 100644 index 0000000000..afcf7c5cb2 --- /dev/null +++ b/frontend/.browserlistrc @@ -0,0 +1,6 @@ +last 2 Chrome versions +last 1 Firefox version +last 2 Edge major versions +last 2 Safari major versions +last 2 iOS major versions +Firefox ESR diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 969977a507..855d2e88ed 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -36,6 +36,7 @@ "@cypress/skip-test": "^2.6.1", "@types/jest": "^29.5.13", "@types/uuid": "^10.0.0", + "browserslist": "^4.24.2", "cypress": "^13.15.0", "cypress-real-events": "^1.13.0", "jest": "^29.7.0", @@ -6936,7 +6937,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { "caniuse-lite": "^1.0.30001669", "electron-to-chromium": "^1.5.41", diff --git a/frontend/package.json b/frontend/package.json index 08e2415442..544a324e45 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -50,6 +50,7 @@ "@cypress/skip-test": "^2.6.1", "@types/jest": "^29.5.13", "@types/uuid": "^10.0.0", + "browserslist": "^4.24.2", "cypress": "^13.15.0", "cypress-real-events": "^1.13.0", "jest": "^29.7.0", diff --git a/frontend/src/app/components/keyresult/keyresult.component.html b/frontend/src/app/components/keyresult/keyresult.component.html index b22ab565fd..01551a20ea 100644 --- a/frontend/src/app/components/keyresult/keyresult.component.html +++ b/frontend/src/app/components/keyresult/keyresult.component.html @@ -5,7 +5,7 @@ class="key-result rounded-2 p-3 w-100 focus-outline" tabindex="0" > -

{{ keyResult.title }}

+

{{ keyResult.title }}

diff --git a/frontend/src/assets/fonts/Roboto.scss b/frontend/src/assets/fonts/Roboto.scss index 2bc9790548..237f11689a 100644 --- a/frontend/src/assets/fonts/Roboto.scss +++ b/frontend/src/assets/fonts/Roboto.scss @@ -1,9 +1,9 @@ @font-face { - font-family: Roboto; - font-display: swap; + font-family: "Roboto"; font-style: normal; - font-weight: 400; - src: url('./Roboto/RobotoFlex-Regular.ttf') format('ttf'), - url('./Roboto/RobotoFlex-Regular.woff2') format('woff2'), - url('./Roboto/RobotoFlex-Regular.woff') format('woff'); + font-display: swap; + src: + url('./Roboto/RobotoFlex-Regular.woff2') format('woff2'), + url('./Roboto/RobotoFlex-Regular.woff') format('woff'), + url('./Roboto/RobotoFlex-Regular.ttf') format('truetype'); } diff --git a/frontend/src/style/styles.scss b/frontend/src/style/styles.scss index 1899bb3d3b..306063e5d4 100644 --- a/frontend/src/style/styles.scss +++ b/frontend/src/style/styles.scss @@ -6,9 +6,10 @@ html, body.okr { - font-size: 100%; margin: 0; padding: 0; + font-weight: 400; + line-height: 115% !important; background-color: $overview-bg; font-family: "Roboto", sans-serif; --bs-body-font-family: "Roboto", "Helvetica Neue", sans-serif;