Skip to content
Snippets Groups Projects
Commit a79bad5c authored by lain's avatar lain
Browse files

StatusContent: Better separate subject from status content.

parent 95f5c7ff
No related branches found
No related tags found
2 merge requests!12172.1.0 into master,!1150StatusContent: Better separate subject from status content.
Pipeline #27420 passed
......@@ -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,
......
......@@ -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) > {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment