diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-03-07 10:15:41 -0500 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-03-07 10:15:41 -0500 |
| commit | 1057227be38fc6af0e7f128f30ff2b991a60c34f (patch) | |
| tree | 873e8c8db666d59eaa680f562e6350bfe08f41ff | |
| parent | aa0d207c945d61678801910719b0b013df75a78a (diff) | |
| parent | ae570ea0ff10853d96465c59bbc6ab9e086786b2 (diff) | |
Merge branch 'fix/collapse-on-same-line' into 'develop'
Put conversation 'Collapse' back on the same line with the rest of the heading.'
See merge request !45
| -rw-r--r-- | src/components/conversation/conversation.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 5f395f46..33a43e15 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -1,10 +1,10 @@ <template> <div class="timeline panel panel-default base00-background"> - <div class="panel-heading base01-background base04" style="justify-content:space-between;"> + <div class="panel-heading base01-background base04"> Conversation - <div v-if="collapsable"> + <span v-if="collapsable" style="float:right;"> <small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small> - </div> + </span> </div> <div class="panel-body"> <div class="timeline"> |