Skip to content
Snippets Groups Projects
Commit 89e6e34d authored by Henrik Askjer's avatar Henrik Askjer
Browse files

Merge branch 'add_explanation_split_infinitive' into 'master'

Add explanation split infinitive

See merge request spraksamlingane/beta.ordbok.uib.no!67
parents a9420795 3d91cf61
No related branches found
No related tags found
No related merge requests found
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
<span v-if="split_inf" tabindex="0"> (kløyvd infinitiv: <i>-a</i> <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"> <v-menu rounded="0" v-model="menu" offset-x max-width="200px">
<template v-slot:activator="{ on, attrs }"> <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 <v-btn x-small icon v-on="on" v-bind="attrs" class="info-button">
color="primary"> <v-icon color="primary" size="14px">$vuetify.icons.value.info</v-icon>
<v-icon middle x-small>$vuetify.icons.value.info</v-icon>
</v-btn> </v-btn>
</template> </template>
<v-card rounded="0" class="info-card"> <v-card rounded="0" class="info-card">
...@@ -136,11 +135,11 @@ article h2.secondary_header { ...@@ -136,11 +135,11 @@ article h2.secondary_header {
padding-bottom: 4px; padding-bottom: 4px;
} }
.help-button { .info-button {
margin-left: 6px; margin-left: 6px;
margin-right: 2px; margin-right: -2px;
margin-bottom: 4px; height: 10px;
color: var(--v-primary-base); width: 10px;
} }
.info-card { .info-card {
......
...@@ -2,10 +2,10 @@ import Vue from 'vue'; ...@@ -2,10 +2,10 @@ import Vue from 'vue';
import 'material-design-icons-iconfont/dist/material-design-icons.css'; import 'material-design-icons-iconfont/dist/material-design-icons.css';
import Vuetify from 'vuetify/lib/framework'; import Vuetify from 'vuetify/lib/framework';
import { library } from '@fortawesome/fontawesome-svg-core' 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 { faFacebookSquare, faTwitterSquare} from '@fortawesome/free-brands-svg-icons'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' 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.component('font-awesome-icon', FontAwesomeIcon);
Vue.use(Vuetify); Vue.use(Vuetify);
...@@ -32,7 +32,7 @@ const FONTAWESOME_ICONS = { ...@@ -32,7 +32,7 @@ const FONTAWESOME_ICONS = {
info: { info: {
component: FontAwesomeIcon, component: FontAwesomeIcon,
props: { props: {
icon: ["fa", "info"] icon: ["fa", "info-circle"]
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment