Skip to content
Snippets Groups Projects
Commit 3f1eeb93 authored by Tore.Brede's avatar Tore.Brede
Browse files

GREG-109: Updating font for UiB theme

parent 951fe081
No related branches found
No related tags found
1 merge request!163GREG-109 Theme updates
Pipeline #100754 failed
Stage: venv update
    Stage: tests and linting
      Hide whitespace changes
      Inline Side-by-side
      frontend/public/index.html
      + 3
      − 0
      View file @ 3f1eeb93
      ...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
      /> />
      <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
      <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <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> <title>Guest Registration</title>
      </head> </head>
      <body> <body>
      ......
      frontend/src/themes/index.ts
      + 3
      − 2
      View file @ 3f1eeb93
      ...@@ -16,6 +16,7 @@ declare module '@mui/material/styles' { ...@@ -16,6 +16,7 @@ declare module '@mui/material/styles' {
      textWhite: string textWhite: string
      } }
      } }
      // allow configuration using `createTheme` // allow configuration using `createTheme`
      interface ThemeOptions { interface ThemeOptions {
      greg?: { greg?: {
      ...@@ -32,9 +33,9 @@ export const defaultTheme = createTheme(mainTheme) ...@@ -32,9 +33,9 @@ export const defaultTheme = createTheme(mainTheme)
      function getTheme() { function getTheme() {
      switch (appTheme) { switch (appTheme) {
      case 'uib': case 'uib':
      return createTheme(deepmerge(defaultTheme, uibTheme)) return createTheme(deepmerge(mainTheme, uibTheme))
      case 'uio': case 'uio':
      return createTheme(deepmerge(defaultTheme, uioTheme)) return createTheme(deepmerge(mainTheme, uioTheme))
      case 'default': case 'default':
      return defaultTheme return defaultTheme
      default: default:
      ......
      frontend/src/themes/uib.ts
      + 6
      − 0
      View file @ 3f1eeb93
      import { ThemeOptions } from '@mui/material' import { ThemeOptions } from '@mui/material'
      /*
      Based on guidelines found here: https://manual.uib.no/profilmanual/profilelementer/
      */
      const uibTheme: ThemeOptions = { const uibTheme: ThemeOptions = {
      greg: { greg: {
      appMinWidth: '60rem', appMinWidth: '60rem',
      appMaxWidth: '110rem', appMaxWidth: '110rem',
      deactivatedColor: '#C9C9C9', deactivatedColor: '#C9C9C9',
      }, },
      typography: {
      fontFamily: ['Open Sans', 'Roboto'].join(','),
      },
      palette: { palette: {
      primary: { primary: {
      main: '#cf3c3a', main: '#cf3c3a',
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment