Merge branch 'feature/timeline-fetch-error' into 'develop'

Visual feedback on failure to fetch new statuses

See merge request !47
This commit is contained in:
Shpuld Shpuldson 2017-03-07 12:15:37 -05:00
commit d954db0221
3 changed files with 33 additions and 6 deletions

View file

@ -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;