Merge pull request #2826 from pixelfed/staging

Update Timeline, fix suggested posts

CHANGELOG.md

@@ -30,6 +30,7 @@
 - Updated SharePipeline, add Undo->Announce support. ([c8e40e0f](https://github.com/pixelfed/pixelfed/commit/c8e40e0f))
 - Updated NetworkTimeline, fix remote comment urls. ([308acc91](https://github.com/pixelfed/pixelfed/commit/308acc91))
 - Updated Timeline component, abstracted reusable partials. ([858f3f9e](https://github.com/pixelfed/pixelfed/commit/858f3f9e))
+- Updated Timeline, fix suggested posts. ([3ba5c88c](https://github.com/pixelfed/pixelfed/commit/3ba5c88c))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)

public/mix-manifest.json

@@ -31,5 +31,5 @@
     "/js/status.js": "/js/status.js?id=aba698844a6047af53cf",
     "/js/story-compose.js": "/js/story-compose.js?id=e93760b2356732faecf8",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=85f0af57479412548223",
-    "/js/timeline.js": "/js/timeline.js?id=1b004d944cfd1ff1ba69"
+    "/js/timeline.js": "/js/timeline.js?id=8a841efb9c8acf97e1d6"
 }

resources/assets/js/components/Timeline.vue

@@ -181,7 +181,7 @@
 						</div>
 
 						<div v-if="!loading && scope == 'home' && recentFeed && discover_feed.length" class="pt-3">
-							<p class="h5 font-weight-bold pt-3 mb-0 d-flex justify-content-between align-items-center">
+							<p class="h5 font-weight-bold py-3 d-flex justify-content-between align-items-center">
 								<span>Suggested Posts</span>
 								<a href="/?a=vop" class="small font-weight-bold">Older Posts</a>
 							</p>
@@ -272,7 +272,7 @@
 								</div>
 							</div>
 
-							<status :status="status" :recommended="true" />
+							<status-card :status="status" :recommended="true" />
 						</div>
 					</div>
 				</div>

resources/assets/js/components/partials/StatusCard.vue

@@ -107,14 +107,14 @@
 					</p>
 				</div>
 				<div class="timestamp mt-2">
-					<p class="small text-uppercase mb-0">
-						<a :href="statusUrl(status)" class="text-muted">
+					<p class="small mb-0">
+						<a :href="statusUrl(status)" class="text-muted text-uppercase">
 							<timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago>
 						</a>
-						<div v-if="recommended">
+						<span v-if="recommended">
 							<span class="px-1">&middot;</span>
 							<span class="text-muted">Based on popular and trending content</span>
-						</div>
+						</span>
 					</p>
 				</div>
 			</div>