diff options
| author | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-07 12:15:37 -0500 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-07 12:15:37 -0500 |
| commit | d954db02219fba8de3542660a2428c4e234d6770 (patch) | |
| tree | 087318b3df059f29ca16ec4ae8c7274dc2f3857e /src/components/timeline/timeline.vue | |
| parent | 3a62ad3c4c6939d03ba3d941d4e6a24e816a2787 (diff) | |
| parent | 086dd832d3d2c8103e7d6f99d72d27bea97ce7b0 (diff) | |
Merge branch 'feature/timeline-fetch-error' into 'develop'
Visual feedback on failure to fetch new statuses
See merge request !47
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 11280a08..ac074f3c 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -4,10 +4,13 @@ <div class="title"> {{title}} </div> - <button @click.prevent="showNewStatuses" class="base06 base02-background loadmore-button" v-if="timeline.newStatusCount > 0"> + <button @click.prevent="showNewStatuses" class="base06 base02-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timeline.error"> Show new ({{timeline.newStatusCount}}) </button> - <button @click.prevent class="base04 base01-background no-press loadmore-button" v-if="!timeline.newStatusCount > 0"> + <button @click.prevent class="base06 error no-press loadmore-button" v-if="timeline.error"> + Error fetching updates + </button> + <button @click.prevent class="base04 base01-background no-press loadmore-button" v-if="!timeline.newStatusCount > 0 && !timeline.error"> Up-to-date </button> </div> @@ -43,6 +46,9 @@ padding: 0.1em 0.3em 0.25em 0.3em; min-width: 6em; } + .error { + background-color: rgba(255, 48, 16, 0.65); + } .no-press { opacity: 0.8; cursor: default; |