diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-04-09 20:29:06 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-04-09 20:29:06 +0000 |
| commit | 716e37d95cd463ede4a5fbe91e7170515719a0fe (patch) | |
| tree | eb64b6f74aef25045b72d820bb11a949212c6b04 /src/components/conversation/conversation.vue | |
| parent | e409ca56e586217786f46cd1fdda8c4090f38aa3 (diff) | |
| parent | bf2d4516d59884c657feed4ebe16bf3f1357bda1 (diff) | |
Merge branch 'cssOverhaul' into 'develop'
Transition to CSS-variables for themes and stuff.
See merge request pleroma/pleroma-fe!217
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 60d43fff..2ff122c2 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 base02-background base04 base03-border conversation-heading"> + <div class="panel-heading conversation-heading"> {{ $t('timeline.conversation') }} <span v-if="collapsable" style="float:right;"> <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small> |