From 228f504490012a96e590a0d71e00702dc706c8fd Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 31 Jan 2020 19:40:29 -0700
Subject: [PATCH 1/3] Update Timeline, move announcements from sidebar to top
 of timeline

---
 resources/assets/js/components/AnnouncementsCard.vue | 7 +++++--
 resources/assets/js/components/Timeline.vue          | 7 +++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/components/AnnouncementsCard.vue b/resources/assets/js/components/AnnouncementsCard.vue
index 4e43b4857..2cdc15c08 100644
--- a/resources/assets/js/components/AnnouncementsCard.vue
+++ b/resources/assets/js/components/AnnouncementsCard.vue
@@ -1,11 +1,14 @@
 <template>
 <div>
 	<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-title mb-0">
 					<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>
 				<p class="card-text">
 					<span style="font-size:13px;">{{announcement.summary}}</span>
diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue
index a8b6024f6..3134d2924 100644
--- a/resources/assets/js/components/Timeline.vue
+++ b/resources/assets/js/components/Timeline.vue
@@ -12,6 +12,9 @@
 					</div>
 				</div>
 				<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 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>
@@ -265,10 +268,6 @@
 					</a>
 				</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">
 					<notification-card></notification-card>
 				</div>

From cbc5eaadf32b34c1a8811a5ee727768688312918 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 31 Jan 2020 19:42:13 -0700
Subject: [PATCH 2/3] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b97085e7..c726d7f3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 ### Updated
 - Updated StatusController, restrict edits to 24 hours ([ae24433b](https://github.com/pixelfed/pixelfed/commit/ae24433b))
 - Updated RateLimit, add max post edits per hour and day ([51fbfcdc](https://github.com/pixelfed/pixelfed/commit/51fbfcdc))
+- Updated Timeline.vue, move announcements from sidebar to top of timeline ([228f5044](https://github.com/pixelfed/pixelfed/commit/228f5044))
 
 ## [v0.10.8 (2020-01-29)](https://github.com/pixelfed/pixelfed/compare/v0.10.7...v0.10.8)
 ### Added

From 0e6f4270dd48c8d3bb8fb002dfa300c61bf00116 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 31 Jan 2020 19:42:33 -0700
Subject: [PATCH 3/3] Update compiled assets

---
 public/js/timeline.js    | Bin 116913 -> 117076 bytes
 public/mix-manifest.json | Bin 1815 -> 1815 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/js/timeline.js b/public/js/timeline.js
index 31d7f506c14f9b1b611d842d0148c3f9300b2972..f07ea6c8bb45bd50530e696c9f7fbea815fc03ed 100644
GIT binary patch
delta 1073
zcmZ9KZ)h8J7{_^%OU}@AZKPSdWZ2}i@zNyMBu%4jjCQM8aDTFOwXo4-%cZ$X<I>#i
z?h-RyhcCu()V^qcFMiY)imyaO={O+>4rMqjE2}buDYn`ALVPo{h~WBS)jMSe`tI|4
ze$Vs#zR&mhU0Wo-Um{lqfd~(##}TY`t98>)7Kr0832xP8`=HGnO&8JD*0au1YP>=D
z6IG^4%YKHP3#Kb4Pw6-4=Pn14mL?7?jt--~jb3s(&JIU-4jtKe*Wd>mX@f^L!v>$<
z{K#N$D{JuOmTd5D>qUdd?%gohe*cQW%lE%ESlFr(uS5=}P{0;Y`<#hUBCQR98zzY1
z(JTzAYm>t!YdD#deLi&Von>qEU)){j$2(={#w%H{s3%UjV<?xmq4k9!_22?$XjVVH
z?rk%NMFFv~Zn8>KlM?|BZLeNM>#H9V<AricH)4Lb3t4adN$8i0FO8t{u#btxpDS>&
zLO2)nFg#o2LKTj!b0KzGDc8BFBCD{WddNt^oy*`tcVN_Sg#KHn2>-7^36n>Cbjx8v
zv2};qd)o;hszd9SZ5<-51UY{~;*^?H_3&u*?in*ri>m*JFU{)a)}=j!zTd|a>D$yN
zB4&gmb>!XOhpvA`s`J~wSP3QYS{=Q2<19Xxg#ko7JdEKI?87T(z=8&fq*LJ<N@%vG
za79m{6ncH8tZ>vEW^>T9)Ub3EYL&{2pedM@LQ!fC9Y6gv`mSa{Pkp_2&w)(l_+(}*
zbu5*6b%H|hs0T6g?TFdAit_pWXzAe_$eHv0^OAadCrdo>*cKGo{gDt}t{&Evs;$2c
z5mri<N$J0n$Y`5tP7v@7iPd&+Gy`^cTeGG4Svw5$*hN~Js^<Jt+D`Znf9nG?@Xc)+
z_JW;HQdDAEsLF~*#838v3?jbL51#;!^8s)*GXYpLX)zZAajj^a(T;>j%QS`|aN|S-
z-tXd*0wb~|?sP&*zS$V51uu;7_}2)yN&bcB!xt~|&CV$FnzWYT81!q+z6gU0*JALy
z)^TPCI>09SeDqmb42t-zIC#AxGhJb2`Dj^I7>Sz|>Ksi~glg%8#K|({*V68dfxEdG
zhd(rN%{#+zx2=;;dLxN4Pgk@twRSxIJOwAU7wm_iWhMD!IUs3;*N(z74t|cx<^92W
WQq(OeCB>%i7~ItTdXRye7ybrFAaPj$

delta 933
zcmYL{T}V@57{__$(J5P+Y%{g2?Ub_P&gSNKTPF(2AS<mPHMi`j=hcOty>7>;_z~R%
zK~efbr@HDQ2!gOU$hychK_a3WD0!77gxzX{r3H58$La3(ygbkU{XZYGBl_pV`e!AO
zTvT1_p$Ts~NR08E)UrxXNvWq45obIvZ953aAq8mC9j|1xC)Vmhe5>H>5csIzltPWI
zyu>@B&g}&9DQ;CtU?n+)F1t{7h9;AHaw$G?s*YS+x}h-oaRZ@EKIL4_l_ONm3I41y
z+3--Otoz$a3G&}3cN$Yk(MY-SXjpLT%S-qQcX6|_bIN8&szx}WMONS6+9)Jn7x(Us
z@?mR)6YZOSF+R~H+9QmMA7sxq2aj)bH@9vkb02;wEAdPnU?p`XABcV?Q#m{<rDY(y
z#0rcrEJ)p9(Td6I&zF+09VztuMAD{f-c-NsgG`zpXv~{WXgq3mr*C-;So{5=Uy^N4
zz(RDETUyRti(lhaOGM*H)?tlbWKC&&ZP#^;)3ZNn{4HBl78ZumsrFEHRGk5<c$dGY
zP+dLs7e?MRk$o3a$<5zgG#in4DcEve>gy1^{d6ba>+A`(O6|0l_Ed(2PI{2oNFI^a
zt`hSdnk)?&$d}b2QftU0cr97U`QxYl-^9dX9(l0-lIm<}=QsA5xShm4sn9X;q-r96
z>?%}I8zvHK*`ci^Q4w3A;Ef(|?3EGj0ial2IuvCakv-ff2AD>7fW?nT3Lr_%APi)I
z5py){YYB-F$%^E$LWls883#PoVTTMZ$cZgG;GIr=9CtyvTJ_Vl8BTg&+>E)93-fJ4
zgD=eW_j<e8J};Jsi($7OAF6Z@4B(hj4ExkekY`GvP!(zNK(3r!20v6KLpfwX8Y(ET
zH`x)3<oy+3Q&YMQfJv^e0OJ<NdMn_sY9Q9_g*n4c%-KA?AhLI;y{M&F_E*6<Rc*8i
w=2Oxz7j%SK#D!$rQB~$f5oBcIK{{}mVWS*MwBN>|*xS=EotVw-8kp|;2MhH*V*mgE

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 89fe1711b791c48ac57f1acb7710e613e8b7d1a1..912392311bd84cf86411ac048367e55716b999bf 100644
GIT binary patch
delta 32
ncmbQvH=S?8e>MpNQxl7nBqI}pRC5D^Bnu-81G6+Gu39btqBRJ_

delta 32
ncmbQvH=S?8e>Mrjlq3to)HGxBRAUQc1Czw0L~~0eu39bttTzc;