diff options
| author | Henry Jameson <me@hjkos.com> | 2018-09-09 15:55:43 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2018-09-09 15:55:43 +0300 |
| commit | 0656e0ef324ae8361a872908bb1b26a3d4ad4129 (patch) | |
| tree | e4c0cf6f8ac98da1204d500d9cfdc04cd7d36f27 /src/components/conversation/conversation.vue | |
| parent | e6adddbba69cbcc71d3f3ba3d0734b7fefbc44d4 (diff) | |
| parent | ed6abeacadc2bced05f3221b2c57ba488f0ae800 (diff) | |
Merge remote-tracking branch 'upstream/develop' into translations-separation
* upstream/develop: (21 commits)
use prime number step for Who to follow panel
fix
Revert "Update messages.js"
Update messages.js Update the Occitan language - Fixed Linting
remove formatting options
Remove outdated settings
features panel i18n
features panes supports chat & gopher
fix collapse link being too small
small fix for non-square gif avatars
Fixed collapseMessageWithSubjectLocal always using instance-provided config.
Fix last place with usercard having wrong width
Fixed non-masked image looking weird in chrome.
Kinda went back to using align-items: stretch. Fixed error message floating.
Simplified image sensitivity label
show features panel only if not login
update
debug
update
debug
...
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 e41929fd..5528fef6 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -3,7 +3,7 @@ <div class="panel-heading conversation-heading"> <span class="title"> {{ $t('timeline.conversation') }} </span> <span v-if="collapsable"> - <small><a href="#" @click.prevent="$emit('toggleExpanded')">{{ $t('timeline.collapse') }}</a></small> + <a href="#" @click.prevent="$emit('toggleExpanded')">{{ $t('timeline.collapse') }}</a> </span> </div> <div class="panel-body"> |