Mergan/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'marked-mfm fixes: spin direction, greentext' (#34) from marked-mfm into develop

Browse source 
Reviewed-on: AkkomaGang/pleroma-fe#34
This commit is contained in:
floatingghost 2022-07-15 09:59:22 +00:00
commit 3ff141a122
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/rich_content/rich_content.jsx
View file

@ -71,12 +71,10 @@ export default {
// NEVER EVER TOUCH DATA INSIDE RENDER // NEVER EVER TOUCH DATA INSIDE RENDER
render () { render () {
// Don't greentext MFM // Don't greentext MFM
if (this.mfm) { const greentext = this.mfm ? false : this.greentext
this.greentext = false
}
// Pre-process HTML // Pre-process HTML
const { newHtml: html } = preProcessPerLine(this.html, this.greentext) const { newHtml: html } = preProcessPerLine(this.html, greentext)
let currentMentions = null // Current chain of mentions, we group all mentions together let currentMentions = null // Current chain of mentions, we group all mentions together
// This is used to recover spacing removed when parsing mentions // This is used to recover spacing removed when parsing mentions
let lastSpacing = '' let lastSpacing = ''

4
static/mfm.css
View file

@ -23,10 +23,10 @@
animation: mfm-spin 0.5s linear infinite; animation: mfm-spin 0.5s linear infinite;
} }
._mfm_spin_[x] { ._mfm_spin_[data-x] {
animation-name: mfm-spinX; animation-name: mfm-spinX;
} }
._mfm_spin_[y] { ._mfm_spin_[data-y] {
animation-name: mfm-spinY; animation-name: mfm-spinY;
} }
._mfm_spin_[left] { ._mfm_spin_[left] {