diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-20 02:51:20 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-20 02:51:20 +0000 |
| commit | 4ba4772e921ce0600e62e116bbc8e68686e51f32 (patch) | |
| tree | c2bff1c7dfe6031728acbd42e2995c329cd829ea /src/components/status/status.vue | |
| parent | 9982376f9a316a5e4224ea44c7392b272f5549d1 (diff) | |
| parent | 3ec8e43a9704b2945d58395dba997adfa2106df5 (diff) | |
Merge branch 'cw-clickthrough' into 'develop'
Add support for configurable CW clickthrough
See merge request pleroma/pleroma-fe!310
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index b8993b0d..e7d5ed7a 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -76,9 +76,11 @@ </div> <div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper"> - <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="hideTallStatus" href="#" @click.prevent="toggleShowTall">Show more</a> - <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html"></div> - <a v-if="showingTall" href="#" class="tall-status-unhider" @click.prevent="toggleShowTall">Show less</a> + <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="hideTallStatus" href="#" @click.prevent="toggleShowMore">Show more</a> + <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html" v-if="!hideSubjectStatus"></div> + <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary" v-else></div> + <a v-if="hideSubjectStatus" href="#" class="cw-status-hider" @click.prevent="toggleShowMore">Show more</a> + <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a> </div> <div v-if='status.attachments' class='attachments media-body'> @@ -310,7 +312,7 @@ } } - .tall-status-unhider { + .status-unhider, .cw-status-hider { width: 100%; text-align: center; } |