diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue index dcbb34c0b41bd31133485adf0c810e645fca556d..3fd85893afc376a7b2ea09713a80655c4d81d637 100644 --- a/src/components/DictionaryView.vue +++ b/src/components/DictionaryView.vue @@ -3,10 +3,10 @@ <div class="search_container" v-if="!article && $route.name != 'lookup'"> <Autocomplete v-on:submit="select_result" :api="get_search_endpoint" v-on:update-lang-form="update_lang_form"> </Autocomplete> - <SearchToolbar v-if="$store.state.showSearchToolbar" @updatePos="update_pos" @updateScope="update_scope"/> + <SearchToolbar @updatePos="update_pos" @updateScope="update_scope"/> </div> - <div id="above_results" v-if="$route.name"> + <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 <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> @@ -77,7 +77,7 @@ <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 class="suggest_lang" v-if="lang=='bm'">Har du søkt i feil ordbok?<br>Prøv å søke i <router-link :to="generate_path($route.query.q, {lang: 'nn'})" @click.native="language_link('nn')">Nynorskordboka</router-link></p> <p class="suggest_lang" v-if="lang=='nn'">Har du søkt i feil ordbok?<br>Prøv å søke i <router-link :to="generate_path($route.query.q, {lang: 'nn'})" @click.native="language_link('bm')">Bokmålsordboka</router-link></p> - <article v-if="similar && similar.length" class="v-sheet v-card rounded-xl did_you_mean"> + <article v-if="similar && similar.length" :class="'v-sheet v-card rounded-xl did_you_mean ' + $vuetify.breakpoint.name"> <span class="dict-label">Mente du:</span> <v-list> <v-list-item v-for="(item, index) in similar" :key="index"> @@ -612,7 +612,7 @@ main { div.welcome { padding-top: 10px; - margin-top: 10px; + margin-top: 0px; flex-grow: 10; background-image: url('../assets/books.jpg'); background-repeat: no-repeat; @@ -643,6 +643,10 @@ div.welcome article { font-size: 18px; } +#above_results.sm div, #above_results.xs div { + padding-top: 0px; +} + #suggestions { padding-left: 10px; } diff --git a/src/components/SearchToolbar.vue b/src/components/SearchToolbar.vue index 211471c5d91df281660ac199941f690e598f73e1..9a15464c83c26b339edb5316f5c6219e65801c28 100644 --- a/src/components/SearchToolbar.vue +++ b/src/components/SearchToolbar.vue @@ -1,5 +1,7 @@ <template> - <v-card rounded="xl"> + <div> + + <v-card v-if="$store.state.showSearchToolbar" rounded="xl"> <v-container fluid v-if="expanded || $vuetify.breakpoint.mdAndUp"> <v-row > @@ -44,9 +46,17 @@ @click="expanded=!expanded"> - <v-icon v-if="!expanded" small left color="primary">filter_alt</v-icon>{{expanded? '' : 'Søkealternativer'}}<v-icon small :right="!expanded">{{expanded ? 'expand_less': 'expand_more'}}</v-icon></v-btn> + {{expanded? '' : 'Søkealternativer'}}<v-icon small :right="!expanded">{{expanded ? 'expand_less': 'expand_more'}}</v-icon></v-btn> </v-card> - +<div v-else> + <v-checkbox + class="single_checkbox" + v-model="fulltext" + dense + label="Fulltekstsøk"/> + +</div> + </div> </template> <script> @@ -142,6 +152,10 @@ export default { min-height: 24px; } +.single_checkbox { + padding-left: 10px; + margin-left: 10px; +} </style>