diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-19 11:39:00 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-19 11:39:00 +0000 |
| commit | 9674320e0983fd35267115fe111711ba5e2ebec8 (patch) | |
| tree | 11410aed1012f1b98ecabb4cb2b7fb47ec52f273 /src/components/conversation/conversation.vue | |
| parent | 86e685ac3452e42c3276e6ea2d3e7988abf2941a (diff) | |
| parent | a7500410ff17fbf742336d065a1dfedf87df587b (diff) | |
Merge branch 'feature/custom-theme' into 'develop'
Customizable themes
Closes #41
See merge request pleroma/pleroma-fe!165
Diffstat (limited to 'src/components/conversation/conversation.vue')
| -rw-r--r-- | src/components/conversation/conversation.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 201afcd5..60d43fff 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,6 +1,6 @@ <template> <div class="timeline panel panel-default"> - <div class="panel-heading base01-background base04 base03-border conversation-heading"> + <div class="panel-heading base02-background base04 base03-border conversation-heading"> {{ $t('timeline.conversation') }} <span v-if="collapsable" style="float:right;"> <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small> |