diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-03-10 13:27:58 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-03-10 13:27:58 +0100 |
| commit | 112adcf8f83e1bd8dd347ef8ee4de46060b53341 (patch) | |
| tree | aa6288f000d72dfd2f166642d413637a77f1aa42 /src/components/timeline/timeline.vue | |
| parent | 0eeccb87cef4d137710e3c7fd215b94e45aff3d1 (diff) | |
| parent | 33f72ab2c215ebd7709edaf7a63062aabe8363cc (diff) | |
Merge branch 'develop' into feature/hash-routed
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index ac074f3c..84defac7 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -4,13 +4,13 @@ <div class="title"> {{title}} </div> - <button @click.prevent="showNewStatuses" class="base06 base02-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timeline.error"> + <button @click.prevent="showNewStatuses" class="base06 base02-background loadmore-button" v-if="timeline.newStatusCount > 0 && !timelineError"> Show new ({{timeline.newStatusCount}}) </button> - <button @click.prevent class="base06 error no-press loadmore-button" v-if="timeline.error"> + <button @click.prevent class="base06 error no-press loadmore-button" v-if="timelineError"> Error fetching updates </button> - <button @click.prevent class="base04 base01-background no-press loadmore-button" v-if="!timeline.newStatusCount > 0 && !timeline.error"> + <button @click.prevent class="base04 base01-background no-press loadmore-button" v-if="!timeline.newStatusCount > 0 && !timelineError"> Up-to-date </button> </div> @@ -18,9 +18,9 @@ <div class="timeline"> <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation> <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> - <div class="base01-background base05-border new-status-notification text-center">Load older statuses.</div> + <div class="base01-background base03-border new-status-notification text-center">Load older statuses.</div> </a> - <div class="base01-background base05-border new-status-notification text-center" v-else>...</div> + <div class="base01-background base03-border new-status-notification text-center" v-else>...</div> </div> </div> </div> |