From a79bad5cdb896fd965e544df3ba8d0a87b3db458 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 19 Jun 2020 12:46:48 +0200
Subject: [PATCH] StatusContent: Better separate subject from status content.
---
.../status_content/status_content.js | 6 ------
.../status_content/status_content.vue | 18 +++++++++++-------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index c0a71e8f77..cfee77a385 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -142,12 +142,6 @@ const StatusContent = {
return html
}
},
- contentHtml () {
- if (!this.status.summary_html) {
- return this.postBodyHtml
- }
- return this.status.summary_html + '<br />' + this.postBodyHtml
- },
...mapGetters(['mergedConfig']),
...mapState({
betterShadow: state => state.interface.browserSupport.cssFilter,
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index efc2485ead..df980a71fb 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -31,7 +31,7 @@
<div
class="status-content media-body"
@click.prevent="linkClicked"
- v-html="contentHtml"
+ v-html="postBodyHtml"
/>
<a
v-if="showingLongSubject"
@@ -53,16 +53,16 @@
@click.prevent="toggleShowMore"
>{{ $t("general.show_more") }}</a>
<div
- v-if="!hideSubjectStatus"
- class="status-content media-body"
+ v-if="status.summary_html"
+ class="status-content media-body summary"
@click.prevent="linkClicked"
- v-html="contentHtml"
+ v-html="status.summary_html"
/>
<div
- v-else
+ v-if="!hideSubjectStatus"
class="status-content media-body"
@click.prevent="linkClicked"
- v-html="status.summary_html"
+ v-html="postBodyHtml"
/>
<a
v-if="hideSubjectStatus"
@@ -181,6 +181,10 @@ $status-margin: 0.75em;
line-height: 1.4em;
white-space: pre-wrap;
+ &.summary {
+ font-weight: bold;
+ }
+
blockquote {
margin: 0.2em 0 0.2em 2em;
font-style: italic;
@@ -226,7 +230,7 @@ $status-margin: 0.75em;
.greentext {
color: $fallback--cGreen;
- color: var(--postGreentext, $fallback--cGreen);
+ color: var(--cGreen, $fallback--cGreen);
}
.timeline :not(.panel-disabled) > {
--
GitLab