diff --git a/src/App.vue b/src/App.vue index d53e69a0192e0b9e8b71a48d9f7b112084697ab7..93519656c27bb92058adf712de413bd4e7b7c9f6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,13 +15,13 @@ <footer> - <div id="photo-attribution" v-if="!$route.name">{{$t('photo')}}</div> + <div id="photo-attribution" v-if="!$route.name"><span :aria-label="$t('background')"/>{{$t('photo')}}</div> <div :class="$vuetify.breakpoint.xs?'sm':'lg'"> <div> - <img id="srlogo" src="./assets/Sprakradet_logo_neg.png" alt=""> + <img id="srlogo" src="./assets/Sprakradet_logo_neg.png" alt="Logo, Språkrådet"> </div> <div> - <img id="uiblogo" src="./assets/uib-logo.svg" alt=""> + <img id="uiblogo" src="./assets/uib-logo.svg" alt="Logo, UiB"> </div> </div> <div><em>Bokmålsordboka</em>{{$t('and')}}<em>Nynorskordboka</em>{{$t('footer_description')}} <a href="mailto:ordbok-beta@uib.no">ordbok-beta@uib.no</a>.</div> @@ -45,15 +45,49 @@ import TopBar from './components/TopBar.vue' <style> - @import url('https://fonts.googleapis.com/css2?family=Inria+Serif:ital,wght@0,400;0,700;1,400;1,700&display=swap'); - @import url('https://fonts.googleapis.com/css2?family=Inria+Serif:ital,wght@0,400;0,700;1,400;1,700&family=Noto+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap'); - - @font-face { - font-family: NotoParen; - font-style: italic; - src: url('./assets/NotoSansParen.woff') format('woff'); - unicode-range: U+28-29; - } +@font-face { + font-family: 'Inria Serif'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('./assets/fC1lPYxPY3rXxEndZJAzN3Srdy0.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +@font-face { + font-family: 'Inria Serif'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('./assets/fC14PYxPY3rXxEndZJAzN3wQUjjCjl0.woff2')format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + + +@font-face { + font-family: 'Noto Sans'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('./assets/o-0IIpQlx3QUlC5A4PNr5TRA.woff2')format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +@font-face { + font-family: 'Noto Sans'; + font-style: italic; + font-weight: 400; + font-display: swap; + src: url('./assets/o-0OIpQlx3QUlC5A4PNr4ARCQ_k.woff2')format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} + +@font-face { + font-family: NotoParen; + font-style: italic; + src: url('./assets/NotoSansParen.woff') format('woff'); + unicode-range: U+28-29; +} #app { diff --git a/src/assets/fC14PYxPY3rXxEndZJAzN3wQUjjCjl0.woff2 b/src/assets/fC14PYxPY3rXxEndZJAzN3wQUjjCjl0.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..ff93cdf8a109f6a12e166508ee96b03217728cc0 Binary files /dev/null and b/src/assets/fC14PYxPY3rXxEndZJAzN3wQUjjCjl0.woff2 differ diff --git a/src/assets/fC1lPYxPY3rXxEndZJAzN3Srdy0.woff2 b/src/assets/fC1lPYxPY3rXxEndZJAzN3Srdy0.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..9d2ea8c087fc4c6ba791519765c0283a9699228a Binary files /dev/null and b/src/assets/fC1lPYxPY3rXxEndZJAzN3Srdy0.woff2 differ diff --git a/src/assets/o-0IIpQlx3QUlC5A4PNr5TRA.woff2 b/src/assets/o-0IIpQlx3QUlC5A4PNr5TRA.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..f630fbcf99c089e02c4127a5142c76b4a0d6f03d Binary files /dev/null and b/src/assets/o-0IIpQlx3QUlC5A4PNr5TRA.woff2 differ diff --git a/src/assets/o-0OIpQlx3QUlC5A4PNr4ARCQ_k.woff2 b/src/assets/o-0OIpQlx3QUlC5A4PNr4ARCQ_k.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..4731222f32e0750846925ee8f60f64b83cf1c754 Binary files /dev/null and b/src/assets/o-0OIpQlx3QUlC5A4PNr4ARCQ_k.woff2 differ diff --git a/src/locales/eng.json b/src/locales/eng.json index 14ff27315d81281f192bde52116677dfea32bc02..43681d267dcfa2cbf34731b68de3e445a015372f 100644 --- a/src/locales/eng.json +++ b/src/locales/eng.json @@ -1,5 +1,6 @@ { "sub_title": "Bokmålsordboka and Nynorskordboka", + "background": "Background image: ", "photo": "Photo by Jeremy Bishop on unsplash.com", "close": "Close", "cancel": "Cancel", diff --git a/src/locales/nno.json b/src/locales/nno.json index 5a7df1d42a550ce4fbd9451175a41402c40caa70..8646908bff74620bcdd2245ba45e98e12837aca5 100644 --- a/src/locales/nno.json +++ b/src/locales/nno.json @@ -1,6 +1,7 @@ { "sub_title": "Bokmålsordboka og Nynorskordboka", "photo": "Foto: Jeremy Bishop (unsplash.com)", + "background": "Bakgrunnsbilde. ", "close": "Lukk", "cancel": "Avbryt", "to_top": "Til toppen", diff --git a/src/locales/nob.json b/src/locales/nob.json index 45e2a831162750cbe8c0ee557f90b0d33e3a6bbb..bdd78ac0dbeff3d1dfd9359b51a70f7a75a072f2 100644 --- a/src/locales/nob.json +++ b/src/locales/nob.json @@ -1,6 +1,7 @@ { "sub_title": "Bokmålsordboka og Nynorskordboka", "photo": "Foto: Jeremy Bishop (unsplash.com)", + "background": "Bakgrunnsbilde. ", "close": "Lukk", "cancel": "Avbryt", "to_top": "Til toppen",