Change headline font

scheb · Mar 9, 2024 · 1b2ec36 · 1b2ec36
1 parent 614a3f8
commit 1b2ec36
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 10 deletions.
diff --git a/web_app/static/fonts/LICENSE → web_app/static/fonts/OFL.txt b/web_app/static/fonts/LICENSE → web_app/static/fonts/OFL.txt
@@ -1,8 +1,8 @@
-Copyright (c) 2009-2011 by Accademia di Belle Arti di Urbino and students of MA course of Visual design. Some rights reserved.
+Copyright 2021 The Urbanist Project Authors (https://github.com/coreyhu/Urbanist)
 
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
+https://openfontlicense.org
 
 
 -----------------------------------------------------------
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
+fonts, including any derivative works, can be bundled, embedded, 
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The

diff --git a/web_app/static/fonts/Urbanist-Regular.woff b/web_app/static/fonts/Urbanist-Regular.woff
diff --git a/web_app/static/fonts/Urbanist-Regular.woff2 b/web_app/static/fonts/Urbanist-Regular.woff2
diff --git a/web_app/static/fonts/titillium-web-regular.woff b/web_app/static/fonts/titillium-web-regular.woff
diff --git a/web_app/static/fonts/titillium-web-regular.woff2 b/web_app/static/fonts/titillium-web-regular.woff2
diff --git a/web_app/static/scss/base.scss b/web_app/static/scss/base.scss
@@ -1,7 +1,7 @@
 // Basic styles and Bootstrap overwrites
 
 h1, h2, h3, h4, h5, h6 {
-    font-family: "Titillium Web", var(--bs-font-sans-serif);
+    font-family: var(--#{$prefix}font-headline);
 }
 
 h1 {

diff --git a/web_app/static/scss/bootstrap.scss b/web_app/static/scss/bootstrap.scss
@@ -4,6 +4,8 @@
 // Configuration
 @import "~bootstrap/scss/functions";
 
+$font-family-headline: Urbanist;
+
 $black: #000;
 $white: #fff;
 $primary: #d07330;
@@ -44,6 +46,12 @@ $link-color: shade-color($primary, 16%);
 
 // Layout & components
 @import "~bootstrap/scss/root";
+
+:root,
+[data-bs-theme="light"] {
+    --#{$prefix}font-headline: #{inspect($font-family-headline)}, #{inspect($font-family-sans-serif)};
+}
+
 @import "~bootstrap/scss/reboot";
 @import "~bootstrap/scss/type";
 //@import "~bootstrap/scss/images";

diff --git a/web_app/static/scss/fonts.scss b/web_app/static/scss/fonts.scss
@@ -1,10 +1,10 @@
-/* titillium-web-regular - latin */
 @font-face {
-    font-family: 'Titillium Web';
+    font-family: 'Urbanist';
     font-style: normal;
     font-weight: 400;
-    src: local('Titillium Web Regular'), local('TitilliumWeb-Regular'),
-        url('../fonts/titillium-web-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-        url('../fonts/titillium-web-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    src: local('Urbanist Regular'),
+         local('Urbanist-Regular'),
+         url('../fonts/Urbanist-Regular.woff2') format('woff2'),
+         url('../fonts/Urbanist-Regular.woff') format('woff');
     font-display: swap;
 }
diff --git a/web_app/static/scss/navigation.scss b/web_app/static/scss/navigation.scss
@@ -22,7 +22,7 @@ header {
         padding: 0.5rem;
         background-color: $gray-900;
         box-shadow: inset -1px -1px 0 rgba(0, 0, 0, .25);
-        font-family: "Titillium Web", var(--bs-font-sans-serif);
+        font-family: var(--#{$prefix}font-headline);
         font-size: 1.3rem;
         border-bottom: 3px solid $primary;