Merge pull request 'Ensure MFM scaling is ignored when rendering is disabled' (#189) from ignore-scale-mfm-disabled into develop

Reviewed-on: AkkomaGang/pleroma-fe#189
This commit is contained in:
floatingghost 2022-11-02 22:34:36 +00:00
commit 251e440dad
3 changed files with 13 additions and 6 deletions

View file

@ -130,11 +130,11 @@ export default {
codeblocks.forEach((pre) => { codeblocks.forEach((pre) => {
content = content.replace(pre, content = content.replace(pre,
pre.replaceAll('<br/>', '\n') pre.replaceAll('<br/>', '\n')
.replaceAll('&amp;', '&') .replaceAll('&amp;', '&')
.replaceAll('&lt;', '<') .replaceAll('&lt;', '<')
.replaceAll('&gt;', '>') .replaceAll('&gt;', '>')
.replaceAll('&quot', '"') .replaceAll('&quot', '"')
.replaceAll('&#39;', "'") .replaceAll('&#39;', "'")
) )
}) })
} }

View file

@ -1,7 +1,7 @@
<template> <template>
<div <div
class="StatusBody" class="StatusBody"
:class="{ '-compact': compact }" :class="{ '-compact': compact, 'mfm-disabled': !renderMisskeyMarkdown }"
> >
<div class="body"> <div class="body">
<div <div

View file

@ -82,9 +82,16 @@
} }
} }
&.mfm-disabled { &.mfm-disabled {
span {
font-size: 100% !important;
}
.mfm { .mfm {
animation: none !important; animation: none !important;
} }
.emoji {
width: 32px !important;
height: 32px !important;
}
} }
} }