diff options
| author | shpuld <shp@cock.li> | 2018-04-10 00:28:24 +0300 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2018-04-10 00:28:24 +0300 |
| commit | 8835c98529809033993b190847989f11b318cf97 (patch) | |
| tree | 9ee82d3bc3a14815288a95425a22abebc8533250 /src/components/conversation/conversation.vue | |
| parent | c214197cee192d9ae511d145d8e28cef8ae9a0d1 (diff) | |
| parent | 716e37d95cd463ede4a5fbe91e7170515719a0fe (diff) | |
Merge hj's css overhaul and fix conflicts
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 e8eb2e5f..4000bce2 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> |