From b80052eb19dbe437f21d926243e8ac14d3d22987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no> Date: Thu, 11 Mar 2021 13:57:26 +0100 Subject: [PATCH] re meta#287 endret "definisjoner" til "betydning" etc., fjernet link fra underartikkel-oversksrift --- src/components/Article.vue | 5 ++++- src/components/SubArticle.vue | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/Article.vue b/src/components/Article.vue index 4c78811..3b6e1dc 100644 --- a/src/components/Article.vue +++ b/src/components/Article.vue @@ -14,7 +14,7 @@ </ul> </section> <section> - <h3>Definisjoner</h3> + <h3>{{def_label}}</h3> <ol> <Definition v-for="definition in article.body.definitions" :dictionary="dictionary" :level="1" :key="definition.id" :body='definition' @article-click="article_link_click" /> </ol> @@ -35,6 +35,9 @@ export default { computed: { dictionary: function() { return this.article.dictionary + }, + def_label: function() { + return this.dictionary == 'bob' ? 'Betydning' : 'Tyding' } }, components: { diff --git a/src/components/SubArticle.vue b/src/components/SubArticle.vue index 8d499ee..5d35065 100644 --- a/src/components/SubArticle.vue +++ b/src/components/SubArticle.vue @@ -1,9 +1,7 @@ <template> <li class="sub_article"> <span class="sub_article_header"> - <router-link :to="'/' + dictionary + '/' + body.article_id" @click.native="article_link_click(body)"> - {{body.lemmas[0]}} - </router-link> + {{body.lemmas[0]}} </span> <ul> <DefElement :body="body.intro" v-if="body.intro" :dictionary="dictionary" @article-click="article_link_click" /> @@ -43,6 +41,7 @@ export default { <style scoped> .sub_article_header { font-weight: bold; + color: var(--v-primary-base); } li.sub_article { -- GitLab