summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-12-31 19:42:23 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-12-31 19:42:23 +0900
commit078b043cae4363714dbd141d594bd968ece1ffb9 (patch)
treea763d5a85d2d4cf061e309ef456ba093a0a9f60b /src/client
parent:art: (diff)
downloadmisskey-078b043cae4363714dbd141d594bd968ece1ffb9.tar.gz
misskey-078b043cae4363714dbd141d594bd968ece1ffb9.tar.bz2
misskey-078b043cae4363714dbd141d594bd968ece1ffb9.zip
Add font MFM syntax
Diffstat (limited to 'src/client')
-rw-r--r--src/client/components/mfm.ts12
-rw-r--r--src/client/pages/mfm-cheat-sheet.vue11
2 files changed, 23 insertions, 0 deletions
diff --git a/src/client/components/mfm.ts b/src/client/components/mfm.ts
index 76399bf6f8..1590e29142 100644
--- a/src/client/components/mfm.ts
+++ b/src/client/components/mfm.ts
@@ -141,6 +141,18 @@ export default defineComponent({
style = `font-size: 600%;`;
break;
}
+ case 'font': {
+ const family =
+ token.node.props.args.serif ? 'serif' :
+ token.node.props.args.monospace ? 'monospace' :
+ token.node.props.args.cursive ? 'cursive' :
+ token.node.props.args.fantasy ? 'fantasy' :
+ token.node.props.args.emoji ? 'emoji' :
+ token.node.props.args.math ? 'math' :
+ null;
+ if (family) style = `font-family: ${family};`;
+ break;
+ }
case 'blur': {
return h('span', {
class: '_mfm_blur_',
diff --git a/src/client/pages/mfm-cheat-sheet.vue b/src/client/pages/mfm-cheat-sheet.vue
index c66fbfb15b..0d599e4583 100644
--- a/src/client/pages/mfm-cheat-sheet.vue
+++ b/src/client/pages/mfm-cheat-sheet.vue
@@ -146,6 +146,16 @@
</div>
</div>
<div class="_section">
+ <div class="_title">{{ $ts._mfm.font }}</div>
+ <div class="_content">
+ <p>{{ $ts._mfm.fontDescription }}</p>
+ <div class="preview _panel">
+ <Mfm :text="preview_font"/>
+ <MkTextarea v-model:value="preview_font"><span>MFM</span></MkTextarea>
+ </div>
+ </div>
+ </div>
+ <div class="_section">
<div class="_title">{{ $ts._mfm.x2 }}</div>
<div class="_content">
<p>{{ $ts._mfm.x2Description }}</p>
@@ -295,6 +305,7 @@ export default defineComponent({
preview_twitch: `[twitch 🍮]`,
preview_spin: `[spin 🍮] [spin.left 🍮] [spin.alternate 🍮]\n[spin.x 🍮] [spin.x,left 🍮] [spin.x,alternate 🍮]\n[spin.y 🍮] [spin.y,left 🍮] [spin.y,alternate 🍮]`,
preview_flip: `[flip ${this.$ts._mfm.dummy}]\n[flip.v ${this.$ts._mfm.dummy}]\n[flip.h,v ${this.$ts._mfm.dummy}]`,
+ preview_font: `[font.serif ${this.$ts._mfm.dummy}]\n[font.monospace ${this.$ts._mfm.dummy}]\n[font.cursive ${this.$ts._mfm.dummy}]\n[font.fantasy ${this.$ts._mfm.dummy}]`,
preview_x2: `[x2 🍮]`,
preview_x3: `[x3 🍮]`,
preview_x4: `[x4 🍮]`,