diff options
| author | scarlett <nia@netbsd.org> | 2018-10-16 14:09:29 +0100 |
|---|---|---|
| committer | scarlett <nia@netbsd.org> | 2018-10-16 14:09:29 +0100 |
| commit | 4cc1ed6171b7fc0e8dc793fbb80e0a63cf83ec40 (patch) | |
| tree | a740845efd742f1a9f1b1a1f0543d996fcb923c2 /src/components/timeline/timeline.vue | |
| parent | 145929207ef9204066b03ab104284168a054b5f0 (diff) | |
| parent | f554edc054fcb6e0508ed5da7dc9edf1a85d2305 (diff) | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index e42c0c4b..2dd4376a 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -4,12 +4,12 @@ <div class="title"> {{title}} </div> - <button @click.prevent="showNewStatuses" class="loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError"> - {{$t('timeline.show_new')}}{{newStatusCountStr}} - </button> <div @click.prevent class="loadmore-error alert error" v-if="timelineError"> {{$t('timeline.error_fetching')}} </div> + <button @click.prevent="showNewStatuses" class="loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError"> + {{$t('timeline.show_new')}}{{newStatusCountStr}} + </button> <div @click.prevent class="loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError"> {{$t('timeline.up_to_date')}} </div> @@ -58,7 +58,6 @@ .timeline { .loadmore-text { - font-size: 14px; opacity: 0.8; background-color: transparent; color: $fallback--faint; @@ -66,11 +65,6 @@ } .loadmore-error { - font-size: 14px; - min-width: 6em; - text-align: center; - padding: 0 0.25em 0 0.25em; - margin: 0; color: $fallback--fg; color: var(--fg, $fallback--fg); } |