style: font as dependency, not checked-in files

spraakbanken · Sep 18, 2024 · 70e2979 · 70e2979
1 parent e0d88d9
commit 70e2979
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Font is now a dependency, not checked-in files (and the font looks slightly different)
+
 ## [9.7.1] - 2024-09-18
 
 ### Fixed

diff --git a/app/index.ts b/app/index.ts
@@ -3,6 +3,8 @@ import $ from "jquery"
 import currentMode from "@/mode"
 import { locationSearchGet } from "@/util"
 import { HashParams } from "@/urlparams"
+import "@fontsource/source-sans-pro/400.css"
+import "@fontsource/source-sans-pro/600.css"
 
 declare global {
     interface Window {

diff --git a/app/styles/SourceSansPro-Regular.otf b/app/styles/SourceSansPro-Regular.otf
diff --git a/app/styles/SourceSansPro-Semibold.otf b/app/styles/SourceSansPro-Semibold.otf
diff --git a/app/styles/styles.scss b/app/styles/styles.scss
@@ -5,16 +5,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 @import "~@fortawesome/fontawesome-free/scss/solid";
 @import "~@fortawesome/fontawesome-free/scss/fontawesome";
 
-@font-face {
-  font-family: "Source Sans Pro";
-  src: url(SourceSansPro-Regular.otf);
-}
-@font-face {
-  font-family: "Source Sans Pro";
-  src: url(SourceSansPro-Semibold.otf);
-  font-weight : bold;
-}
-
 * {
     box-sizing: border-box;
 }

diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
     "name": "korp-frontend",
     "version": "9.7.1",
     "dependencies": {
+        "@fontsource/source-sans-pro": "^5.1.0",
         "@fortawesome/fontawesome-free": "6.2.1",
         "@types/angular-dynamic-locale": "^0.1.35",
         "@types/angular-ui-bootstrap": "^1.0.7",

diff --git a/yarn.lock b/yarn.lock
@@ -28,6 +28,11 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
+"@fontsource/source-sans-pro@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-5.1.0.tgz#17f39585dcfe9726effae887d1200b2fa8b8861a"
+  integrity sha512-GJijHmnPKwA1G8MqUVOZzbIW8jLBFsJGugAb5/IikvTHHmLp+pJy+g8EhyWbfR8pI04i/EStzW0AzOv0KQEhzg==
+
 "@fortawesome/[email protected]":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz#344baf6ff9eaad7a73cff067d8c56bfc11ae5304"