Merge branch 'master' into 'sak346'

# Conflicts:
#   package.json

src/App.vue

@@ -184,5 +184,24 @@ footer > div.sm > div {
   height: 60px;
 }
 
+/*
+Hyperlink style in about page and article content
+*/
+@media (hover: none) {
+  article a:not(.choose):not(.return_to_results a), .about a {
+     text-decoration: underline;
+  } 
+}
+
+@media (hover: hover) {
+  article  a, .about a {
+     text-decoration: none;
+  } 
+  article a:hover:not(.choose):not(.return_to_results a), .about a:hover {
+  text-decoration: underline;
+  }
+
+}
+
 
 </style>

src/components/About.vue

@@ -44,7 +44,7 @@
           <li>Sturla Berg-Olsen, seniorrådgiver</li>
           <li>Knut E. Karlsen, seniorrådgiver</li>
           <li>Dagfinn Rødningen, seniorrådgiver</li>
-          <li>Ellen Hellebostad Toft, seniorrådgiver</li>
+          <li>Ålov Runde, seniorrådgiver</li>
       </ul>
 
   <h3>Opphavsrett</h3>

src/components/Article.vue

@@ -217,22 +217,6 @@ ul li.definition {
 }
 
 
-
-@media (hover: none) {
-  article a:not(.choose):not(.return_to_results a) {
-     text-decoration: underline;
-  } 
-}
-
-@media (hover: hover) {
-  article  a {
-     text-decoration: none;
-  } 
-  article a:hover:not(.choose):not(.return_to_results a) {
-  text-decoration: underline;
-  }
-}
-
 .choose {
   color: var(--v-primary-base) !important;
 }

src/components/Autocomplete.vue

@@ -31,6 +31,9 @@
       </span>
       ({{data.item.lang? data.item.lang[1] ? "bm, nn" : {"bob": "bm", "nob": "nn"}[data.item.lang[0]] : 'fritekstsøk'}})
       </template>
+      <template slot="no-data">
+        <div></div>
+      </template>
     </v-combobox>
   </div>
 </template>

src/components/Header.vue

@@ -9,9 +9,8 @@
     <span v-if="split_inf" tabindex="0"> (kløyvd infinitiv: <i>-a</i>
       <v-menu rounded="0" v-model="menu" offset-x max-width="200px">
         <template v-slot:activator="{ on, attrs }">
-          <v-btn v-bind="attrs" v-on="on" depressed min-width="14px" max-width="14px" class="help-button" x-small
-            color="primary">
-            <v-icon middle x-small>$vuetify.icons.value.info</v-icon>
+          <v-btn aria-label="Mer informasjon om kløyvd infinitiv" x-small icon v-on="on" v-bind="attrs" class="info-button">
+            <v-icon color="primary" size="14px">$vuetify.icons.value.info</v-icon>
           </v-btn>
         </template>
         <v-card rounded="0" class="info-card">
@@ -136,11 +135,11 @@ article h2.secondary_header {
   padding-bottom: 4px;
 }
 
-.help-button {
+.info-button {
   margin-left: 6px;
-  margin-right: 2px;
-  margin-bottom: 4px;
-  color: var(--v-primary-base);
+  margin-right: -2px;
+  height: 10px;
+  width: 10px;
 }
 
 .info-card {

src/plugins/vuetify.js

@@ -2,10 +2,10 @@ import Vue from 'vue';
 import 'material-design-icons-iconfont/dist/material-design-icons.css';
 import Vuetify from 'vuetify/lib/framework';
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faShareAltSquare, faInfo} from '@fortawesome/free-solid-svg-icons'
+import { faShareAltSquare, faInfoCircle} from '@fortawesome/free-solid-svg-icons'
 import { faFacebookSquare, faTwitterSquare} from '@fortawesome/free-brands-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
-library.add(faFacebookSquare, faTwitterSquare, faShareAltSquare, faInfo)
+library.add(faFacebookSquare, faTwitterSquare, faShareAltSquare, faInfoCircle)
 Vue.component('font-awesome-icon', FontAwesomeIcon);
 
 Vue.use(Vuetify);
@@ -32,7 +32,7 @@ const FONTAWESOME_ICONS = {
   info: {
     component: FontAwesomeIcon,
     props: {
-      icon:  ["fa", "info"]
+      icon:  ["fa", "info-circle"]
     }
   }
 }