From 974663c42df54445af23dae42c597da491be5212 Mon Sep 17 00:00:00 2001 From: sfr Date: Mon, 1 Aug 2022 11:10:54 +0000 Subject: [PATCH] Fix broken MFM tags (#93) Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/93 Co-authored-by: sfr Co-committed-by: sfr --- package.json | 3 +-- static/mfm.css | 12 +++++++++--- yarn.lock | 20 ++++---------------- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index e93692eb..727d7602 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,7 @@ "js-cookie": "^3.0.1", "localforage": "1.10.0", "marked": "^4.0.17", - "marked-mfm": "^0.4.0", - "mfm-js": "^0.22.1", + "marked-mfm": "^0.5.0", "parse-link-header": "1.0.1", "phoenix": "1.6.2", "punycode.js": "2.1.0", diff --git a/static/mfm.css b/static/mfm.css index a59ec2ce..ae60eb23 100644 --- a/static/mfm.css +++ b/static/mfm.css @@ -37,11 +37,11 @@ } ._mfm_jump_ { - animation: mfm-jump 0.75 linear infinite; + animation: mfm-jump 0.75s linear infinite; } ._mfm_bounce_ { - animation: mfm-bounce 0.75 linear infinite; + animation: mfm-bounce 0.75s linear infinite; transform-origin: center bottom; } @@ -67,7 +67,13 @@ font-size: 600%; } -/* blur */ +._mfm_blur_ { + filter: blur(6px); + transition: filter 0.3s +} +._mfm_blur_:hover { + filter: blur(0px); +} ._mfm_rainbow_ { animation: mfm-rainbow 1s linear infinite; diff --git a/yarn.lock b/yarn.lock index 6f5f927a..1f01ff03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7445,10 +7445,10 @@ markdown-table@^2.0.0: dependencies: repeat-string "^1.0.0" -marked-mfm@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/marked-mfm/-/marked-mfm-0.4.0.tgz#d3094c42daaa57b1b0b263278633de82ebf62396" - integrity sha512-2ZdBHGOV7BFJUcQNLp/jjwEE2IT1O5d1H7cd4dGeuOBI1nivuBCv1Azt7fbRlygfUSQ2rgGtFZ1ZbrP4dRhh3A== +marked-mfm@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/marked-mfm/-/marked-mfm-0.5.0.tgz#0632c4fa8f5044d350b3aaa771b136e5d50b4b60" + integrity sha512-nRazH80nu7gVEDeORQWCWehY3v7fofC4usKdY/d6mckxfRY4PrPNLM3iGpVedpij9ktmesWAtY7SpCLq/BxP4Q== dependencies: "@babel/core" "^7.18.6" "@babel/preset-env" "^7.18.6" @@ -7561,13 +7561,6 @@ methods@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" -mfm-js@^0.22.1: - version "0.22.1" - resolved "https://registry.npmjs.org/mfm-js/-/mfm-js-0.22.1.tgz" - integrity sha512-UV5zvDKlWPpBFeABhyCzuOTJ3RwrNrmVpJ+zz/dFX6D/ntEywljgxkfsLamcy0ZSwUAr0O+WQxGHvAwyxUgsAQ== - dependencies: - twemoji-parser "14.0.x" - micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz" @@ -10747,11 +10740,6 @@ tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz" -twemoji-parser@14.0.x: - version "14.0.0" - resolved "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-14.0.0.tgz" - integrity sha512-9DUOTGLOWs0pFWnh1p6NF+C3CkQ96PWmEFwhOVmT3WbecRC+68AIqpsnJXygfkFcp4aXbOp8Dwbhh/HQgvoRxA== - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"