From 5159a34b3e53ebb0ad8f9c52c0399bcf838a15f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no>
Date: Wed, 9 Oct 2019 08:16:38 +0200
Subject: [PATCH] =?UTF-8?q?begynte=20p=C3=A5=20etymologi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 2 +-
src/components/Article.vue | 22 ++++++++++++++--------
src/components/DefElement.vue | 16 ++++++++++++++++
3 files changed, 31 insertions(+), 9 deletions(-)
create mode 100644 src/components/DefElement.vue
diff --git a/src/App.vue b/src/App.vue
index 4327fb14..49fc419e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,8 +26,8 @@ export default {
font-family: 'Avenir', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
- text-align: center;
color: #2c3e50;
margin-top: 60px;
+ margin-left: 600px;
}
</style>
diff --git a/src/components/Article.vue b/src/components/Article.vue
index 0d4ee405..acb939b2 100644
--- a/src/components/Article.vue
+++ b/src/components/Article.vue
@@ -1,12 +1,23 @@
<template>
<div class="hello">
<h1>{{ article_header }}</h1>
+ <div class="">
+ <h3>Etymologi</h3>
+ <ul>
+ <DefElement v-for="(item, index) in article.etymology" :key="index" :element='item' v-if="item.content" />
+ </ul>
+ </div>
+ <div class="">
+ <h3>Definisjoner</h3>
+ </div>
</div>
</template>
<script>
import axios from "axios";
+import DefElement from './DefElement.vue'
+
export default {
name: 'Article',
props: {
@@ -33,6 +44,9 @@ export default {
)
return lemmas.join(', ')
}
+ },
+ components: {
+ DefElement
}
}
</script>
@@ -42,14 +56,6 @@ export default {
h3 {
margin: 40px 0 0;
}
-ul {
- list-style-type: none;
- padding: 0;
-}
-li {
- display: inline-block;
- margin: 0 10px;
-}
a {
color: #42b983;
}
diff --git a/src/components/DefElement.vue b/src/components/DefElement.vue
new file mode 100644
index 00000000..d6bd09d8
--- /dev/null
+++ b/src/components/DefElement.vue
@@ -0,0 +1,16 @@
+<template>
+ <li>
+ <div :class="element.type">
+ {{ element.content }}
+ </div>
+ </li>
+</template>
+
+<script>
+export default {
+ name: 'DefElement',
+ props: {
+ element: Object
+ }
+}
+</script>
--
GitLab