diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-04-14 09:52:54 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-04-14 09:52:54 +0000 |
| commit | 9587c6dac1b40ff07eb421b62010fbd98343a4d9 (patch) | |
| tree | f7882465adf2c399f9c498c5b095ac3c1969d0cf /src/components/timeline/timeline.vue | |
| parent | 3153bb5b053e1be73492ebe1b230cc313f3c5d5e (diff) | |
| parent | ab2546ab38b2aafb4456e1860477cdd63b2c4dfb (diff) | |
Merge branch 'fix/better-timeline-min-max-id-behavior' into 'develop'
Fix/better timeline min max id behavior
See merge request pleroma/pleroma-fe!233
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 03f6ad3d..c4e0fbce 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -7,7 +7,7 @@ <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="timelineError"> + <div @click.prevent class="loadmore-error alert error" v-if="timelineError"> {{$t('timeline.error_fetching')}} </div> <div @click.prevent class="loadmore-text" v-if="!timeline.newStatusCount > 0 && !timelineError"> @@ -84,13 +84,26 @@ right: 0.6em; font-size: 14px; min-width: 6em; + font-family: sans-serif; + text-align: center; + padding: 0 0.5em 0 0.5em; + opacity: 0.8; background-color: transparent; color: $fallback--faint; color: var(--faint, $fallback--faint); + } + + .loadmore-error { + position: absolute; + right: 0.6em; + font-size: 14px; + min-width: 6em; font-family: sans-serif; text-align: center; - padding: 0 0.5em 0 0.5em; - opacity: 0.8; + padding: 0 0.25em 0 0.25em; + margin: 0; + color: $fallback--fg; + color: var(--fg, $fallback--fg); } } |