From 3f1eeb931d08775cc86bc8a6b4113c9de3e409e4 Mon Sep 17 00:00:00 2001
From: Tore Brede <Tore.Brede@uib.no>
Date: Thu, 18 Nov 2021 16:19:17 +0100
Subject: [PATCH] GREG-109: Updating font for UiB theme
---
frontend/public/index.html | 3 +++
frontend/src/themes/index.ts | 5 +++--
frontend/src/themes/uib.ts | 6 ++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/frontend/public/index.html b/frontend/public/index.html
index 6e242e17..979dbe86 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -11,6 +11,9 @@
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+ <link rel="preconnect" href="https://fonts.googleapis.com">
+ <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+ <link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet">
<title>Guest Registration</title>
</head>
<body>
diff --git a/frontend/src/themes/index.ts b/frontend/src/themes/index.ts
index 447708e5..05b22f8b 100644
--- a/frontend/src/themes/index.ts
+++ b/frontend/src/themes/index.ts
@@ -16,6 +16,7 @@ declare module '@mui/material/styles' {
textWhite: string
}
}
+
// allow configuration using `createTheme`
interface ThemeOptions {
greg?: {
@@ -32,9 +33,9 @@ export const defaultTheme = createTheme(mainTheme)
function getTheme() {
switch (appTheme) {
case 'uib':
- return createTheme(deepmerge(defaultTheme, uibTheme))
+ return createTheme(deepmerge(mainTheme, uibTheme))
case 'uio':
- return createTheme(deepmerge(defaultTheme, uioTheme))
+ return createTheme(deepmerge(mainTheme, uioTheme))
case 'default':
return defaultTheme
default:
diff --git a/frontend/src/themes/uib.ts b/frontend/src/themes/uib.ts
index 0b4c788e..8313b977 100644
--- a/frontend/src/themes/uib.ts
+++ b/frontend/src/themes/uib.ts
@@ -1,11 +1,17 @@
import { ThemeOptions } from '@mui/material'
+/*
+ Based on guidelines found here: https://manual.uib.no/profilmanual/profilelementer/
+ */
const uibTheme: ThemeOptions = {
greg: {
appMinWidth: '60rem',
appMaxWidth: '110rem',
deactivatedColor: '#C9C9C9',
},
+ typography: {
+ fontFamily: ['Open Sans', 'Roboto'].join(','),
+ },
palette: {
primary: {
main: '#cf3c3a',
--
GitLab