UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Timeline, move announcements from sidebar to top of timeline

Browse source
This commit is contained in:
Daniel Supernault 2020-01-31 19:40:29 -07:00
parent 1156cb09d6
commit 228f504490
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
resources/assets/js/components/AnnouncementsCard.vue
View file

@ -1,11 +1,14 @@
<template> <template>
<div> <div>
<transition name="fade"> <transition name="fade">
<div v-if="announcements.length" class="card border shadow-none mb-3" style="max-width: 18rem;"> <div v-if="announcements.length" class="card border shadow-none mb-3">
<div class="card-header text-muted bg-white">
<i class="fas fa-bullhorn mr-2"></i> <span class="text-weight-light">ANNOUNCEMENTS</span>
<span class="float-right cursor-pointer" title="Close" @click="close"><i class="fas fa-times text-lighter"></i></span>
</div>
<div class="card-body"> <div class="card-body">
<div class="card-title mb-0"> <div class="card-title mb-0">
<span class="font-weight-bold">{{announcement.title}}</span> <span class="font-weight-bold">{{announcement.title}}</span>
<span class="float-right cursor-pointer" title="Close" @click="close"><i class="fas fa-times text-lighter"></i></span>
</div> </div>
<p class="card-text"> <p class="card-text">
<span style="font-size:13px;">{{announcement.summary}}</span> <span style="font-size:13px;">{{announcement.summary}}</span>

7
resources/assets/js/components/Timeline.vue
View file

@ -12,6 +12,9 @@
</div> </div>
</div> </div>
<div :data-status-id="status.id" v-for="(status, index) in feed" :key="`${index}-${status.id}`"> <div :data-status-id="status.id" v-for="(status, index) in feed" :key="`${index}-${status.id}`">
<div v-if="index == 0 && showTips && !loading" class="mb-4 card-tips">
<announcements-card v-on:show-tips="showTips = $event"></announcements-card>
</div>
<div v-if="index == 2 && showSuggestions == true && suggestions.length" class="card mb-sm-4 status-card card-md-rounded-0 shadow-none border"> <div v-if="index == 2 && showSuggestions == true && suggestions.length" class="card mb-sm-4 status-card card-md-rounded-0 shadow-none border">
<div class="card-header d-flex align-items-center justify-content-between bg-white border-0 pb-0"> <div class="card-header d-flex align-items-center justify-content-between bg-white border-0 pb-0">
<h6 class="text-muted font-weight-bold mb-0">Suggestions For You</h6> <h6 class="text-muted font-weight-bold mb-0">Suggestions For You</h6>
@ -265,10 +268,6 @@
</a> </a>
</div> </div>
<div v-if="showTips && !loading" class="mb-4 card-tips">
<announcements-card v-on:show-tips="showTips = $event"></announcements-card>
</div>
<div v-show="modes.notify == true && !loading" class="mb-4"> <div v-show="modes.notify == true && !loading" class="mb-4">
<notification-card></notification-card> <notification-card></notification-card>
</div> </div>