diff --git a/src/App.vue b/src/App.vue index 442599958c01e59745691f8fe7c58f19be813cb3..bc5ad3f0b1612d3e5874559cf7bc61a659a38692 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,34 +1,34 @@ <template> - <main id="app"> - <header> - <h1><a href="/">Ordbøkene</a></h1> - <p class="about-link"><a href="#">OM ORDBØKENE</a></p> - <p class="sub-title"><a href="/">Bokmål- og Nynorskordboka</a></p> - <p class="mission-statement"><a href="/">Skrivemåte og bøying i tråd med norsk rettskriving </a></p> - </header> - <div class="search_container"> - <autocomplete :debounceTime="100" :auto-select="true" :search="search" @submit="select_result" placeholder="søk..." ref="search"> - <template #result="{result, props}"> - <li class="suggestion" v-bind="props">{{result.label}}</li> - </template> - </autocomplete> - <div class="lang_select_container"> - <select class="lang_select" name="lang" v-model="lang"> - <option value="bob,nob">Begge målformer </option> - <option value="bob">Bokmål</option> - <option value="nob">Nynorsk</option> - </select> + <div id="app"> + <main> + <header> + <h1><a href="/">Ordbøkene</a></h1> + <p class="about-link"><a href="#">OM ORDBØKENE</a></p> + <p class="sub-title"><a href="/">Bokmål- og Nynorskordboka</a></p> + <p class="mission-statement"><a href="/">Skrivemåte og bøying i tråd med norsk rettskriving </a></p> + </header> + <div class="search_container"> + <autocomplete :debounceTime="100" :auto-select="true" :search="search" @submit="select_result" placeholder="søk..." ref="search"> + <template #result="{result, props}"> + <li class="suggestion" v-bind="props">{{result.label}}</li> + </template> + </autocomplete> + <div class="lang_select_container"> + <select class="lang_select" name="lang" v-model="lang"> + <option value="bob,nob">Begge målformer </option> + <option value="bob">Bokmål</option> + <option value="nob">Nynorsk</option> + </select> + </div> </div> - </div> - <img id="spinner" :class="waiting ? 'show' : 'hide'" src="./assets/spinner.gif" alt="Venter på innhold" /> - <SearchResults :hits="search_results" :lang="lang" @article-click="article_link_click" v-show="! waiting" /> - <div id="single_article_container"> - <Article :key="article_key" :article="article" @article-click="article_link_click" /> - </div> - <div class="welcome" v-show="! (article.error || article.lemmas.length || search_results.length || waiting)"> - <p>... - </p> - </div> + <img id="spinner" :class="waiting ? 'show' : 'hide'" src="./assets/spinner.gif" alt="Venter på innhold" /> + <SearchResults :hits="search_results" :lang="lang" @article-click="article_link_click" v-show="! waiting" /> + <div id="single_article_container"> + <Article :key="article_key" :article="article" @article-click="article_link_click" /> + </div> + <div class="welcome" v-show="! (article.error || article.lemmas.length || search_results.length || waiting)"> + </div> + </main> <footer> <div> <img id="uiblogo" src="./assets/uib-logo.svg" alt=""> @@ -41,7 +41,7 @@ Språkrådet forvalter rettskrivningen i nynorsk og bokmål.</p> </div> </footer> - </main> + </div> </template> <script> @@ -293,9 +293,10 @@ p.about-link > a{ } main { - background-image: url('./assets/beta.png'); + background-image: url('./assets/books.jpg'); background-repeat: no-repeat; background-attachment: fixed; + min-height: 600px; } header, #search_results, #spinner, #single_article_container, footer, div.welcome, div.search_container { @@ -307,7 +308,7 @@ header, #search_results, #spinner, #single_article_container, footer, div.welcom } header { - padding-top: 60px; + padding-top: 20px; padding-bottom: 20px; background-color: #560027; } diff --git a/src/assets/books.jpg b/src/assets/books.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0287c25e7ea45af55cb71553d542f2ac3407ad61 Binary files /dev/null and b/src/assets/books.jpg differ diff --git a/src/components/Article.vue b/src/components/Article.vue index 89f00cf07981441e3c4309560f259d74b8936b5c..e21757d1f0ea73e429c4c03529370582691cfd51 100644 --- a/src/components/Article.vue +++ b/src/components/Article.vue @@ -61,6 +61,7 @@ article { margin: 10px; border-radius: 10px; background-color: #FFFFFF; + box-shadow: 10px 5px 5px rgba(0, 0, 0, 0.5); } h3 { diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue index 434f3c0a612a84cf0e763e354f6c2aa6c0c80b8c..9ad6ecb8b223d2243f14533cf19a050949f8b3a7 100644 --- a/src/components/SearchResults.vue +++ b/src/components/SearchResults.vue @@ -51,6 +51,8 @@ export default { <style> h2 { color: #560027; + margin: 0px; + padding: 20px 0px 20px 0px; } .hits {