AkkomaGang
/
akkoma-fe
4
13
Fork 56
Code Issues 71 Pull Requests 16 Projects Releases 1 Wiki Activity

Merge pull request 'marked-mfm fixes: spin direction, greentext' (#34) from marked-mfm into develop
ci/woodpecker/push/woodpecker Pipeline was successful Details 

Reviewed-on: AkkomaGang/pleroma-fe#34
This commit is contained in:
floatingghost 2022-07-15 09:59:22 +00:00
parent 931ed3d3c7 dba047ce34
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
render () {
// Don't greentext MFM
if (this.mfm) {
this.greentext = false
}
const greentext = this.mfm ? false : this.greentext
// 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
// This is used to recover spacing removed when parsing mentions
let lastSpacing = ''

4
static/mfm.css
View File

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