aboutsummaryrefslogtreecommitdiff
path: root/src/components/mentions/mentions.vue
diff options
context:
space:
mode:
authorshpuld <shpuld@gmail.com>2017-03-05 19:00:35 +0200
committershpuld <shpuld@gmail.com>2017-03-05 19:00:35 +0200
commite19bfb9a22f1db562de7079b71dee6e53a8a54fb (patch)
tree8f12ac8f21679e036f42e0a156f345bf4d0f2156 /src/components/mentions/mentions.vue
parent015bf78dd9b17a1eac11119e38d8e83be8d791ae (diff)
parent049c74f8e87e0aa19ee416bb72c987296a3e2dc9 (diff)
Merged from develop, made 'new notices' into a 'show new' button placed on the heading element, updated headings and buttons to be more consistent with new changes (log-in, notifications/read, conversation/collapse), changed bottom 'load older' block to not disappear on click to keep screen from scrolling and changed its styling more consistent with everything else.
Diffstat (limited to 'src/components/mentions/mentions.vue')
-rw-r--r--src/components/mentions/mentions.vue7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/components/mentions/mentions.vue b/src/components/mentions/mentions.vue
index 59f00241..7af402ce 100644
--- a/src/components/mentions/mentions.vue
+++ b/src/components/mentions/mentions.vue
@@ -1,10 +1,5 @@
<template>
- <div class="timeline panel panel-default">
- <div class="panel-heading base01-background base04">Mentions</div>
- <div class="panel-body">
- <Timeline v-bind:timeline="timeline" v-bind:timeline-name="'mentions'"/>
- </div>
- </div>
+ <Timeline :title="'Mentions'" v-bind:timeline="timeline" v-bind:timeline-name="'mentions'"/>
</template>
<script src="./mentions.js"></script>