diff --git a/locales/en-US.yml b/locales/en-US.yml index 07173c131e..c442d41c1e 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -2543,12 +2543,16 @@ _mfm: rotateDescription: "Turns content by a specified angle." position: "Position" positionDescription: "Move content by a specified amount." + crop: "Crop" + cropDescription: "Crop content." followMouse: "Follow Mouse" followMouseDescription: "Content will follow the mouse. On mobile it will follow wherever the user taps." scale: "Scale" scaleDescription: "Scale content by a specified amount." foreground: "Foreground color" foregroundDescription: "Change the foreground color of text." + fade: 'Fade' + fadeDescription: 'Fade text in and out.' background: "Background color" backgroundDescription: "Change the background color of text." plain: "Plain" diff --git a/packages/frontend/src/components/MkMfmWindow.vue b/packages/frontend/src/components/MkMfmWindow.vue index fd23eb0097..a742ad184c 100644 --- a/packages/frontend/src/components/MkMfmWindow.vue +++ b/packages/frontend/src/components/MkMfmWindow.vue @@ -304,6 +304,16 @@ +
+
{{ i18n.ts._mfm.crop }}
+
+

{{ i18n.ts._mfm.cropDescription }}

+
+ + MFM +
+
+
{{ i18n.ts._mfm.position }}
@@ -316,7 +326,7 @@
{{ i18n.ts._mfm.followMouse }}
- {{ i18n.ts._mfm.uncommonFeature }} + {{ i18n.ts._mfm.uncommonFeature }}

{{ i18n.ts._mfm.followMouseDescription }}

@@ -336,6 +346,16 @@
+
+
{{ i18n.ts._mfm.fade }}
+
+

{{ i18n.ts._mfm.fadeDescription }}

+
+ + MFM +
+
+
{{ i18n.ts._mfm.foreground }}
@@ -445,6 +465,9 @@ const preview_rotate = ref( '$[rotate 🍮]\n$[rotate.deg=45 🍮]\n$[rotate.x,deg=45 Hello, world!]', ); const preview_position = ref('$[position.y=-1 🍮]\n$[position.x=-1 🍮]'); +const preview_crop = ref( + "$[crop.top=50 🍮] $[crop.right=50 🍮] $[crop.bottom=50 🍮] $[crop.left=50 🍮]", +); const preview_followmouse = ref('$[followmouse.x 🍮]\n$[followmouse.x,y,rotateByVelocity,speed=0.4 🍮]'); const preview_scale = ref( '$[scale.x=1.3 🍮]\n$[scale.x=1.5,y=3 🍮]\n$[scale.y=0.3 🍮]', @@ -454,6 +477,7 @@ const preview_bg = ref('$[bg.color=31748f Background color]'); const preview_plain = ref( '**bold** @mention #hashtag `code` $[x2 🍮]', ); +const preview_fade = ref(`$[fade 🍮] $[fade.out 🍮] $[fade.speed=3s 🍮] $[fade.delay=3s 🍮]`);