diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-07-02 04:50:03 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-07-02 04:50:03 +0000 |
| commit | c0fb35b10628df0e0b84838a5adfd77840f40b41 (patch) | |
| tree | e463425072e0664e604bff2adc3cb36030465fc6 /src/components/timeline/timeline.vue | |
| parent | 0ca3a6e63d6dd8ed59cdf0c14780b5616667accc (diff) | |
| parent | beb160bd537abcb7f2e147c7954886d2f51d385f (diff) | |
Merge branch 'develop' into 'xenofem/pleroma-fe-rebased-image-description-authoring'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 9777bd0c..111c0976 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -19,14 +19,14 @@ {{ errorData.statusText }} </div> <button - v-if="timeline.newStatusCount > 0 && !timelineError && !errorData" + v-else-if="showLoadButton" class="loadmore-button" @click.prevent="showNewStatuses" > - {{ $t('timeline.show_new') }}{{ newStatusCountStr }} + {{ loadButtonString }} </button> <div - v-if="!timeline.newStatusCount > 0 && !timelineError && !errorData" + v-else class="loadmore-text faint" @click.prevent > |