diff options
| author | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-01 16:58:42 -0500 |
|---|---|---|
| committer | Shpuld Shpuldson <shpuld@gmail.com> | 2017-03-01 16:58:42 -0500 |
| commit | 6075915223e26fc0b535d87a3cdf26435245937e (patch) | |
| tree | 67c03cd787184a79595d0def66d917053cbcf5c9 /src/components/timeline/timeline.vue | |
| parent | 51294082e079e83c7bc0df94e21e750d2a663a27 (diff) | |
| parent | bed37646f929ba7241f382a0ce06555d20b163b0 (diff) | |
Merge branch 'feature/restructure-timelines' into 'develop'
Unify notice timelines to make changes easier.
See merge request !36
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 45886f6c..15ac5ff8 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -1,20 +1,25 @@ <template> - <div class="timeline"> - <a href="#" v-on:click.prevent='showNewStatuses()' v-if="timeline.newStatusCount > 0"> - <div class="base01-background base05-border new-status-notification"> - <p class="text-center" > - {{timeline.newStatusCount}} new statuses - </p> + <div class="timeline panel panel-default"> + <div class="panel-heading base01-background base04">{{title}}</div> + <div class="panel-body"> + <div class="timeline"> + <a href="#" v-on:click.prevent='showNewStatuses()' v-if="timeline.newStatusCount > 0"> + <div class="base01-background base05-border new-status-notification"> + <p class="text-center" > + {{timeline.newStatusCount}} new statuses + </p> + </div> + </a> + <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"> + <p class="text-center" > + Load older statuses. + </p> + </div> + </a> </div> - </a> - <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"> - <p class="text-center" > - Load older statuses. - </p> - </div> - </a> + </div> </div> </template> <script src="./timeline.js"></script> |