Merge remote-tracking branch 'origin/develop' into misc-style-fixes-or-changes
+ better comment
This commit is contained in:
commit
17c04d4d83
17 changed files with 521 additions and 140 deletions
|
|
@ -18,8 +18,8 @@ library.add(
|
|||
faPollH
|
||||
)
|
||||
|
||||
const StatusContent = {
|
||||
name: 'StatusContent',
|
||||
const StatusBody = {
|
||||
name: 'StatusBody',
|
||||
props: [
|
||||
'compact',
|
||||
'collapse', // replaces newlines with spaces
|
||||
|
|
@ -150,4 +150,4 @@ const StatusContent = {
|
|||
}
|
||||
}
|
||||
|
||||
export default StatusContent
|
||||
export default StatusBody
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
:faint="compact"
|
||||
:html="status.summary_raw_html"
|
||||
:emoji="status.emojis"
|
||||
:is-local="status.isLocal"
|
||||
/>
|
||||
<button
|
||||
v-show="longSubject && showingLongSubject"
|
||||
|
|
@ -45,6 +46,7 @@
|
|||
:faint="compact"
|
||||
:greentext="mergedConfig.greentext"
|
||||
:attentions="status.attentions"
|
||||
:is-local="status.is_local"
|
||||
@parse-ready="onParseReady"
|
||||
/>
|
||||
<div
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue