Merge branch 'menus-and-settings' into pagination

src/components/ArticleFooter.vue

@@ -14,37 +14,37 @@
 
       <v-btn v-if="showLinkCopy"
              x-small depressed class="toolbar-button" rounded tabindex="0" @click="copy_link">
-        <v-icon small>link</v-icon><span class = "button-text">{{$t("article_footer.copy_link")}}</span>
+        <v-icon small left>link</v-icon><span class = "button-text">{{$t("article_footer.copy_link")}}</span>
       </v-btn>
 
       <v-btn v-if="webShareApiSupported" depressed x-small class="toolbar-button" rounded tabindex="0" @click="shareViaWebShare">
-        <v-icon x-small>share</v-icon><span class = "button-text">{{$t("article_footer.share")}}</span>
+        <v-icon x-small left>share</v-icon><span class = "button-text">{{$t("article_footer.share")}}</span>
       </v-btn>
       <v-dialog max-width="600px" v-model="citation_dialog">
         <template v-slot:activator="{ on, attrs }">
             <v-btn depressed x-small class="toolbar-button" rounded tabindex="0" v-on="on" v-bind="attrs">
-        <v-icon x-small>format_quote</v-icon> <span class = "button-text">{{$t("article_footer.cite")}}</span>
+        <v-icon left x-small>format_quote</v-icon> <span class = "button-text">{{$t("article_footer.cite")}}</span>
       </v-btn>
 
         </template>
 
         <v-card>
-          <v-card-title>Sitere artikkelen</v-card-title>
-          <v-card-text>
+          <v-toolbar elevation="0">
+            <v-toolbar-title>Sitere artikkelen</v-toolbar-title>
+            <v-spacer></v-spacer><v-toolbar-items><v-btn :aria-label="$t('article_footer.cancel')" @click="close_citation_dialog" text><v-icon>close</v-icon></v-btn></v-toolbar-items></v-toolbar>
+          <v-card-text class="text--primary">
           {{$t("article_footer.description")}}
           <br/>
           <div id = "citation" v-html="this.create_citation()"/>
           </v-card-text>
-          <v-card-actions>
-          <v-btn depressed x-small class="toolbar-button" rounded tabindex="0" @click="copy_citation"><br>
-            <v-icon x-small icon>content_copy</v-icon>  <span class = "button-text">{{$t("article_footer.copy")}}</span>
+          <v-card-actions >
+          <v-btn depressed :x-small="$vuetify.breakpoint.mobile" :small="!$vuetify.breakpoint.mobile" rounded tabindex="0" @click="copy_citation"><br>
+            <v-icon left :x-small="$vuetify.breakpoint.mobile" :small="!$vuetify.breakpoint.mobile" icon>content_copy</v-icon>  <span class = "button-text">{{$t("article_footer.copy")}}</span>
           </v-btn>
-                    <v-btn depressed x-small class="toolbar-button" rounded tabindex="0" @click="download_ris"><br>
-            <v-icon x-small icon>get_app</v-icon> <span class = "button-text">{{$t("article_footer.download")}}</span>
-          </v-btn><v-spacer/>
-                    <v-btn depressed x-small class="toolbar-button" rounded tabindex="0" @click="close_citation_dialog"><br>
-            <v-icon x-small icon>close</v-icon> <span class = "button-text">{{$t("article_footer.cancel")}}</span>
+                    <v-btn depressed :x-small="$vuetify.breakpoint.mobile" :small="!$vuetify.breakpoint.mobile" rounded tabindex="0" @click="download_ris"><br>
+            <v-icon left :x-small="$vuetify.breakpoint.mobile" :small="!$vuetify.breakpoint.mobile" icon>get_app</v-icon> <span class = "button-text">{{$t("article_footer.download")}}</span>
           </v-btn>
+                    
           </v-card-actions>
         </v-card>
       </v-dialog>
@@ -143,12 +143,6 @@ export default {
 </script>
 <style scoped>
 
-.button-text {
-  padding-left: 3px;
-  font-size: 12px;
-  color: var(--v-primary-base) !important;
-}
-
 .v-icon {
   color: var(--v-primary-base) !important;
 }

src/components/Menu.vue

@@ -23,7 +23,7 @@
 
             </v-card-text>
              <v-card-actions><v-spacer/>
-                      <v-btn rounded depressed @click='$store.commit("resetStore")'>Tilbakestill</v-btn>
+                      <v-btn rounded depressed @click='$store.commit("resetStore")'>{{$t("menu.reset")}}</v-btn>
                       <v-btn rounded depressed @click="$emit('close')">{{$t("close")}}</v-btn> 
              </v-card-actions>