sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

StatusContent: Better separate subject from status content.

Browse source
This commit is contained in:
lain 2020-06-19 12:46:48 +02:00
parent 95f5c7fff6
commit a79bad5cdb
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/status_content/status_content.js
View file

@ -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,

22
src/components/status_content/status_content.vue
View file

@ -31,7 +31,7 @@
<div
class="status-content media-body"
@click.prevent="linkClicked"
v-html="contentHtml"
v-html="postBodyHtml"
/>
<a
v-if="showingLongSubject"
@ -52,17 +52,17 @@
href="#"
@click.prevent="toggleShowMore"
>{{ $t("general.show_more") }}</a>
<div
v-if="status.summary_html"
class="status-content media-body summary"
@click.prevent="linkClicked"
v-html="status.summary_html"
/>
<div
v-if="!hideSubjectStatus"
class="status-content media-body"
@click.prevent="linkClicked"
v-html="contentHtml"
/>
<div
v-else
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) > {