Merge branch 'GREG-72-nicer-footer-and-header' into 'master'
Greg 72 nicer footer and header See merge request !97
Showing
- frontend/.env 2 additions, 2 deletionsfrontend/.env
- frontend/package-lock.json 6638 additions, 2636 deletionsfrontend/package-lock.json
- frontend/public/locales/nb/common.json 1 addition, 1 deletionfrontend/public/locales/nb/common.json
- frontend/public/locales/nb/footer.json 1 addition, 1 deletionfrontend/public/locales/nb/footer.json
- frontend/public/locales/nn/common.json 1 addition, 1 deletionfrontend/public/locales/nn/common.json
- frontend/public/locales/nn/footer.json 1 addition, 1 deletionfrontend/public/locales/nn/footer.json
- frontend/src/components/languageselector/index.tsx 26 additions, 12 deletionsfrontend/src/components/languageselector/index.tsx
- frontend/src/components/loading/index.tsx 0 additions, 1 deletionfrontend/src/components/loading/index.tsx
- frontend/src/components/page/page.tsx 5 additions, 2 deletionsfrontend/src/components/page/page.tsx
- frontend/src/contexts/userContext.ts 2 additions, 1 deletionfrontend/src/contexts/userContext.ts
- frontend/src/i18n.ts 3 additions, 3 deletionsfrontend/src/i18n.ts
- frontend/src/index.tsx 6 additions, 6 deletionsfrontend/src/index.tsx
- frontend/src/providers/userProvider.tsx 14 additions, 7 deletionsfrontend/src/providers/userProvider.tsx
- frontend/src/routes/components/footer.tsx 40 additions, 53 deletionsfrontend/src/routes/components/footer.tsx
- frontend/src/routes/components/header.tsx 64 additions, 41 deletionsfrontend/src/routes/components/header.tsx
- frontend/src/routes/components/logos/index.tsx 34 additions, 0 deletionsfrontend/src/routes/components/logos/index.tsx
- frontend/src/routes/components/logos/uio-logo-acronym-white.svg 1 addition, 0 deletions...nd/src/routes/components/logos/uio-logo-acronym-white.svg
- frontend/src/routes/components/logos/uio-segl-full-neg-en.svg 1 addition, 0 deletions...tend/src/routes/components/logos/uio-segl-full-neg-en.svg
- frontend/src/routes/components/logos/uio-segl-full-neg-no.svg 1 addition, 0 deletions...tend/src/routes/components/logos/uio-segl-full-neg-no.svg
- frontend/src/routes/components/userInfo.tsx 6 additions, 10 deletionsfrontend/src/routes/components/userInfo.tsx
Loading
Please register or sign in to comment