diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-04 17:29:58 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-04 17:29:58 +0000 |
| commit | 3cd1deb133926281920f10c1ddd6eb694c09f44d (patch) | |
| tree | 967f2024cb0b1b37e160a9cd21c4bede459ed916 /src/components/status/status.vue | |
| parent | d5757d44e5596f7e3de59d5420bb30b237a0533c (diff) | |
| parent | 9d72c7e1bd935b4a308fe2221344edf156288894 (diff) | |
Merge branch 'issue-154-shorten-cw-subject' into 'develop'
Issue #154 shorten subject
Closes #154
See merge request pleroma/pleroma-fe!520
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index ea8fa0cb..9986107f 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -88,7 +88,12 @@ </div> </div> - <div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper"> + <div class="status-content-wrapper" :class="{ 'tall-status': !showingLongSubject }" v-if="longSubject"> + <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="!showingLongSubject" href="#" @click.prevent="showingLongSubject=true">Show more</a> + <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html"></div> + <a v-if="showingLongSubject" href="#" class="status-unhider" @click.prevent="showingLongSubject=false">Show less</a> + </div> + <div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper" v-else> <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_html" v-else></div> @@ -96,7 +101,7 @@ <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a> </div> - <div v-if="status.attachments && !hideSubjectStatus" class="attachments media-body"> + <div v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)" class="attachments media-body"> <attachment class="non-gallery" v-for="attachment in nonGalleryAttachments" |