From 0b8163ed39617e94b6f765b85cbbb4b39de1ff3f Mon Sep 17 00:00:00 2001 From: Henrik Askjer <henrik.askjer@uib.no> Date: Mon, 10 Jan 2022 16:20:44 +0100 Subject: [PATCH] adapt margins and padding to fulltext checkbox --- src/components/DictionaryView.vue | 21 +++++++++++---------- src/components/SearchToolbar.vue | 1 + src/components/TopBar.vue | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue index 3fd85893..b4c527a5 100644 --- a/src/components/DictionaryView.vue +++ b/src/components/DictionaryView.vue @@ -8,15 +8,15 @@ </div> <div id="above_results" v-if="$route.name" :class="$vuetify.breakpoint.name"> <div id="suggestions" v-if="!article && !no_results"> - <p v-if="inflection_suggestions && inflection_suggestions.length"><v-icon left color="primary">info</v-icon><em>{{$route.query.q}}</em> er en bøyd form av + <div class="search_notification" v-if="inflection_suggestions && inflection_suggestions.length"><v-icon left color="primary">info</v-icon><em>{{$route.query.q}}</em> er en bøyd form av <span v-for="(item,index) in inflection_suggestions" :key="index"><router-link :to="generate_path(item[0])" @click.native="suggestion_link(item[0])">{{item[0]}}</router-link>{{index == inflection_suggestions.length-1? '.' : ', '}}</span> - </p> - <p v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.nn && search_results.nn.length == 0)"><v-icon left color="primary">info</v-icon>Legg til lignende treff fra Nynorskordboka: + </div> + <div class="search_notification" v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.nn && search_results.nn.length == 0)"><v-icon left color="primary">info</v-icon>Legg til lignende treff fra Nynorskordboka: <span v-for="(item,index) in similar" :key="index"><router-link :to="generate_path($route.query.q+'|'+item[0])" @click.native="suggestion_link($route.query.q+'|'+item[0])">{{item[0]}}</router-link>{{index == similar.length-1? '.' : ', '}}</span> - </p> - <p v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.bm && search_results.bm.length == 0)"><v-icon left color="primary">info</v-icon>Legg til lignende treff fra Bokmålsordboka: + </div> + <div class="search_notification" v-if="lang=='bm,nn' && similar && similar.length > 0 && (search_results.bm && search_results.bm.length == 0)"><v-icon left color="primary">info</v-icon>Legg til lignende treff fra Bokmålsordboka: <span v-for="(item,index) in similar" :key="index"><router-link :to="generate_path($route.query.q+'|'+item[0])" @click.native="suggestion_link($route.query.q+'|'+item[0])">{{item[0]}}</router-link>{{index == similar.length-1? '.' : ', '}}</span> - </p> + </div> </div> <div class="return_to_results" v-if="article"> @@ -612,7 +612,7 @@ main { div.welcome { padding-top: 10px; - margin-top: 0px; + margin-top: 10px; flex-grow: 10; background-image: url('../assets/books.jpg'); background-repeat: no-repeat; @@ -637,14 +637,15 @@ div.welcome article { padding-right: calc((100vw - 1200px) / 2); } -#above_results div { +#above_results .search_notification { padding-top: 10px; + padding-bottom: 0px; margin-left: 10px; font-size: 18px; } -#above_results.sm div, #above_results.xs div { - padding-top: 0px; +#above_results.sm .search_notification, #above_results.xs .search_notification { + padding-top: 10px; } #suggestions { diff --git a/src/components/SearchToolbar.vue b/src/components/SearchToolbar.vue index 9a15464c..2bb6bda4 100644 --- a/src/components/SearchToolbar.vue +++ b/src/components/SearchToolbar.vue @@ -53,6 +53,7 @@ class="single_checkbox" v-model="fulltext" dense + hide-details label="Fulltekstsøk"/> </div> diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue index ecf46571..02647f2f 100644 --- a/src/components/TopBar.vue +++ b/src/components/TopBar.vue @@ -1,7 +1,7 @@ <template> <div> <v-app-bar elevate-on-scroll app class = "top-bar" dense dark color="primary"> - <v-app-bar-title class="beta" :title="release" aria-label="Ordbøkene: Bokmålsordboka og Nynorskordboka"><a href ="/">Ordbøkene.no</a></v-app-bar-title> + <v-app-bar-title class="beta" :title="release" aria-label="Ordbøkene: Bokmålsordboka og Nynorskordboka"><a href ="/">{{$vuetify.breakpoint.smAndDown ? 'Ordbøkene' : 'Ordbøkene.no'}}</a></v-app-bar-title> <v-spacer/> <v-divider vertical/> -- GitLab