Skip to content
Snippets Groups Projects
Commit 889f80c9 authored by Henrik Askjer's avatar Henrik Askjer
Browse files

Merge branch 'dev' into 'prod'

Dev: webfonts

See merge request spraksamlingane/beta.ordbok.uib.no!136
parents 83def48f aa097dba
No related branches found
No related tags found
No related merge requests found
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
<footer> <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 :class="$vuetify.breakpoint.xs?'sm':'lg'">
<div> <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>
<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> </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> <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' ...@@ -45,15 +45,49 @@ import TopBar from './components/TopBar.vue'
<style> <style>
@import url('https://fonts.googleapis.com/css2?family=Inria+Serif:ital,wght@0,400;0,700;1,400;1,700&display=swap'); @font-face {
@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-family: 'Inria Serif';
font-style: normal;
@font-face { font-weight: 400;
font-family: NotoParen; font-display: swap;
font-style: italic; src: url('./assets/fC1lPYxPY3rXxEndZJAzN3Srdy0.woff2') format('woff2');
src: url('./assets/NotoSansParen.woff') format('woff'); 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;
unicode-range: U+28-29; }
}
@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 { #app {
......
File added
File added
File added
File added
{ {
"sub_title": "Bokmålsordboka and Nynorskordboka", "sub_title": "Bokmålsordboka and Nynorskordboka",
"background": "Background image: ",
"photo": "Photo by Jeremy Bishop on unsplash.com", "photo": "Photo by Jeremy Bishop on unsplash.com",
"close": "Close", "close": "Close",
"cancel": "Cancel", "cancel": "Cancel",
......
{ {
"sub_title": "Bokmålsordboka og Nynorskordboka", "sub_title": "Bokmålsordboka og Nynorskordboka",
"photo": "Foto: Jeremy Bishop (unsplash.com)", "photo": "Foto: Jeremy Bishop (unsplash.com)",
"background": "Bakgrunnsbilde. ",
"close": "Lukk", "close": "Lukk",
"cancel": "Avbryt", "cancel": "Avbryt",
"to_top": "Til toppen", "to_top": "Til toppen",
......
{ {
"sub_title": "Bokmålsordboka og Nynorskordboka", "sub_title": "Bokmålsordboka og Nynorskordboka",
"photo": "Foto: Jeremy Bishop (unsplash.com)", "photo": "Foto: Jeremy Bishop (unsplash.com)",
"background": "Bakgrunnsbilde. ",
"close": "Lukk", "close": "Lukk",
"cancel": "Avbryt", "cancel": "Avbryt",
"to_top": "Til toppen", "to_top": "Til toppen",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment