From fa7892e3ee457c7dcee3b306825b9738ed9f68be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no> Date: Wed, 5 Aug 2020 14:46:29 +0200 Subject: [PATCH] overskrift, hvit bakgrunn artikler, footer-bakgrunn helt ut til sidene --- src/App.vue | 25 +++++++++++++++++++++++-- src/components/Definition.vue | 2 +- src/components/Header.vue | 14 +++----------- src/components/SearchResults.vue | 2 +- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/App.vue b/src/App.vue index 7565e7b..8fbb77d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,7 @@ <template> <main id="app"> <header> + <h1>Søk i Ordbøkene</h1> <span class="top">EID AV UNIVERSITETET I BERGEN OG SPRÅKRÅDET</span> <p class="mission-statement">Bokmålsordboka og Nynorskordboka er dei einaste fritt tilgjengelege ordbøkene som gjer svar på korleis ord skal skrivast og bøyast i norsk i tråd med gjeldande rettskriving.</p> @@ -198,16 +199,36 @@ body { margin: 0px; } +h1 { + font-family: Inria Serif; + font-size: 36px; + color: #560027; +} + main { - padding-top: 60px; + background-image: url('./assets/beta.png'); + background-repeat: no-repeat; + background-attachment: fixed; +} + +header, #search_results, article, footer, div.welcome { padding-left: calc((100vw - 1000px) / 2); padding-right: calc((100vw - 1000px) / 2); - background-color: #FDF4F5; background-image: url('./assets/beta.png'); background-repeat: no-repeat; background-attachment: fixed; } +header { + padding-top: 60px; + padding-bottom: 20px; + background-color: #FDF4F5; +} + +section, article { + background-color: #FFFFFF; +} + .top { color: #560027; font-weight: bold; diff --git a/src/components/Definition.vue b/src/components/Definition.vue index 29944fa..d1b2c2d 100644 --- a/src/components/Definition.vue +++ b/src/components/Definition.vue @@ -84,7 +84,7 @@ q { } .highlighted { - background-color: #ddddff; + background-color: #FDF4F5; border-radius: 5px; } </style> diff --git a/src/components/Header.vue b/src/components/Header.vue index 97f5bc7..aaf5f65 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -1,6 +1,6 @@ <template> <div> - <h1 v-for="(lemma, index) in lemmas" :key="index"> + <h1 class="article_header" v-for="(lemma, index) in lemmas" :key="index"> {{lemma.lemma}}{{index+1 < lemmas.length ? ',' : ''}} </h1> <details title="Klikk for å se bøyninger"> <summary>{{group_list}}</summary> @@ -40,17 +40,14 @@ export default { } </script> -<style> +<style scoped> .word-classification { text-decoration: underline dashed; } -h1 { +h1.article_header { display: inline; - font-family: Inria Serif; - font-size: 36px; - color: #560027; } .inflection table { @@ -58,11 +55,6 @@ h1 { margin: 10px; } -.homograph { - font-size: smaller; - font-weight: normal; -} - .inflection td, .inflection th { border: solid; border-width: 1px; diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue index 7004671..40db8b1 100644 --- a/src/components/SearchResults.vue +++ b/src/components/SearchResults.vue @@ -1,5 +1,5 @@ <template> - <section> + <section id="search_results"> <h2 v-if="hits.length">Søkeresultater</h2> <div class="flex-container"> <ul class="hits" v-if="results_bob.length"> -- GitLab