diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-07-02 14:31:07 +0300 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-07-02 14:31:07 +0300 |
| commit | 150516df4e186a7f75bfa97377a5a2e89272c377 (patch) | |
| tree | 79d34553706d71c557eb21cbf72858b61aaa5d8b /src/components/timeline/timeline.vue | |
| parent | b8ed904c0c4a387dccc1b107452bc0d669c174e2 (diff) | |
| parent | c0fb35b10628df0e0b84838a5adfd77840f40b41 (diff) | |
Merge branch 'xenofem/pleroma-fe-rebased-image-description-authoring' of git.pleroma.social:pleroma/pleroma-fe into xenofem/pleroma-fe-rebased-image-description-authoring
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 > |