mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-09-21 17:52:00 +03:00
Merge branch 'develop'
This commit is contained in:
syuilo
commit
09591fa4ae
12
CHANGELOG.md
12
CHANGELOG.md
|
|
@ -9,6 +9,18 @@
|
||||||
You should also include the user name that made the change.
|
You should also include the user name that made the change.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
## 12.117.1 (2022/07/19)
|
||||||
|
|
||||||
|
### Improvements
|
||||||
|
- Client: UIのブラッシュアップ @syuilo
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- Server: ファイルのアップロードに失敗することがある問題を修正 @acid-chicken
|
||||||
|
- Client: リアクションピッカーがアプリ内ウィンドウの後ろに表示されてしまう問題を修正 @syuilo
|
||||||
|
- Client: ユーザー情報の取得の再試行を修正 @xianonn
|
||||||
|
- Client: MFMチートシートの挙動を修正 @syuilo
|
||||||
|
- Client: 「インスタンスからのお知らせを受け取る」の設定を変更できない問題を修正 @syuilo
|
||||||
|
|
||||||
## 12.117.0 (2022/07/18)
|
## 12.117.0 (2022/07/18)
|
||||||
|
|
||||||
### Improvements
|
### Improvements
|
||||||
|
|
|
||||||
|
|
@ -1038,6 +1038,8 @@ _mfm:
|
||||||
sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
|
sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。"
|
||||||
rotate: "回転"
|
rotate: "回転"
|
||||||
rotateDescription: "指定した角度で回転させます。"
|
rotateDescription: "指定した角度で回転させます。"
|
||||||
|
plain: "プレーン"
|
||||||
|
plainDescription: "内側の構文を全て無効にします。"
|
||||||
|
|
||||||
_instanceTicker:
|
_instanceTicker:
|
||||||
none: "表示しない"
|
none: "表示しない"
|
||||||
|
|
|
||||||
|
|
@ -885,6 +885,7 @@ enableAutoSensitiveDescription: "Ak je zapnuté, príznak NSFW sa na médiách a
|
||||||
activeEmailValidationDescription: "Dôkladnejšie overí e-mailovú adresu používateľa tým, že zistí, či ide o vyradenú e-mailovú adresu a či sa s ňou dá skutočne komunikovať. Ak nie je začiarknuté, e-mailová adresa sa kontroluje len ako text."
|
activeEmailValidationDescription: "Dôkladnejšie overí e-mailovú adresu používateľa tým, že zistí, či ide o vyradenú e-mailovú adresu a či sa s ňou dá skutočne komunikovať. Ak nie je začiarknuté, e-mailová adresa sa kontroluje len ako text."
|
||||||
navbar: "Navigačný panel"
|
navbar: "Navigačný panel"
|
||||||
account: "Účty"
|
account: "Účty"
|
||||||
|
move: "Pohyb"
|
||||||
_sensitiveMediaDetection:
|
_sensitiveMediaDetection:
|
||||||
description: "Strojové učenie sa použije na automatickú detekciu citlivých médií na účely ich moderovania. Mierne sa zvýši zaťaženie servera."
|
description: "Strojové učenie sa použije na automatickú detekciu citlivých médií na účely ich moderovania. Mierne sa zvýši zaťaženie servera."
|
||||||
sensitivity: "Citlivosť detekcie"
|
sensitivity: "Citlivosť detekcie"
|
||||||
|
|
@ -1691,6 +1692,7 @@ _deck:
|
||||||
alwaysShowMainColumn: "Vždy zobraziť v hlavnom stĺpci"
|
alwaysShowMainColumn: "Vždy zobraziť v hlavnom stĺpci"
|
||||||
columnAlign: "Zarovnať stĺpce"
|
columnAlign: "Zarovnať stĺpce"
|
||||||
addColumn: "Pridať stĺpec"
|
addColumn: "Pridať stĺpec"
|
||||||
|
configureColumn: "Nastavenie stĺpcov"
|
||||||
swapLeft: "Vymeniť vľavo"
|
swapLeft: "Vymeniť vľavo"
|
||||||
swapRight: "Vymeniť vpravo"
|
swapRight: "Vymeniť vpravo"
|
||||||
swapUp: "Vymeniť hore"
|
swapUp: "Vymeniť hore"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"version": "12.117.0",
|
"version": "12.117.1",
|
||||||
"codename": "indigo",
|
"codename": "indigo",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
|
||||||
|
|
@ -101,13 +101,17 @@ export async function getFileInfo(path: string, opts: {
|
||||||
let porn = false;
|
let porn = false;
|
||||||
|
|
||||||
if (!opts.skipSensitiveDetection) {
|
if (!opts.skipSensitiveDetection) {
|
||||||
[sensitive, porn] = await detectSensitivity(
|
await detectSensitivity(
|
||||||
path,
|
path,
|
||||||
type.mime,
|
type.mime,
|
||||||
opts.sensitiveThreshold ?? 0.5,
|
opts.sensitiveThreshold ?? 0.5,
|
||||||
opts.sensitiveThresholdForPorn ?? 0.75,
|
opts.sensitiveThresholdForPorn ?? 0.75,
|
||||||
opts.enableSensitiveMediaDetectionForVideos ?? false,
|
opts.enableSensitiveMediaDetectionForVideos ?? false,
|
||||||
);
|
).then(value => {
|
||||||
|
[sensitive, porn] = value;
|
||||||
|
}, error => {
|
||||||
|
warnings.push(`detectSensitivity failed: ${error}`);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
"@rollup/plugin-alias": "3.1.9",
|
"@rollup/plugin-alias": "3.1.9",
|
||||||
"@rollup/plugin-json": "4.1.0",
|
"@rollup/plugin-json": "4.1.0",
|
||||||
"@syuilo/aiscript": "0.11.1",
|
"@syuilo/aiscript": "0.11.1",
|
||||||
"@vitejs/plugin-vue": "3.0.0",
|
"@vitejs/plugin-vue": "3.0.1",
|
||||||
"@vue/compiler-sfc": "3.2.37",
|
"@vue/compiler-sfc": "3.2.37",
|
||||||
"abort-controller": "3.0.0",
|
"abort-controller": "3.0.0",
|
||||||
"autobind-decorator": "2.4.0",
|
"autobind-decorator": "2.4.0",
|
||||||
|
|
@ -73,7 +73,7 @@
|
||||||
"uuid": "8.3.2",
|
"uuid": "8.3.2",
|
||||||
"v-debounce": "0.1.2",
|
"v-debounce": "0.1.2",
|
||||||
"vanilla-tilt": "1.7.2",
|
"vanilla-tilt": "1.7.2",
|
||||||
"vite": "3.0.0",
|
"vite": "3.0.2",
|
||||||
"vue": "3.2.37",
|
"vue": "3.2.37",
|
||||||
"vue-prism-editor": "2.0.0-alpha.2",
|
"vue-prism-editor": "2.0.0-alpha.2",
|
||||||
"vuedraggable": "4.0.1",
|
"vuedraggable": "4.0.1",
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ const props = withDefaults(defineProps<{
|
||||||
canResize: false,
|
canResize: false,
|
||||||
closeButton: true,
|
closeButton: true,
|
||||||
mini: false,
|
mini: false,
|
||||||
front: true,
|
front: false,
|
||||||
contextmenu: null,
|
contextmenu: null,
|
||||||
buttonsLeft: () => [],
|
buttonsLeft: () => [],
|
||||||
buttonsRight: () => [],
|
buttonsRight: () => [],
|
||||||
|
|
|
||||||
|
|
@ -1,301 +1,313 @@
|
||||||
<template>
|
<template>
|
||||||
<MkStickyContainer>
|
<MkStickyContainer>
|
||||||
<template #header><MkPageHeader/></template>
|
<template #header><MkPageHeader/></template>
|
||||||
<div class="mwysmxbg">
|
<MkSpacer :content-max="800">
|
||||||
<div>{{ $ts._mfm.intro }}</div>
|
<div class="mwysmxbg">
|
||||||
|
<div>{{ $ts._mfm.intro }}</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.mention }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.mentionDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_mention"/>
|
||||||
|
<MkTextarea v-model="preview_mention"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.hashtag }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.hashtagDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_hashtag"/>
|
||||||
|
<MkTextarea v-model="preview_hashtag"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.url }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.urlDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_url"/>
|
||||||
|
<MkTextarea v-model="preview_url"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.link }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.linkDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_link"/>
|
||||||
|
<MkTextarea v-model="preview_link"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.emoji }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.emojiDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_emoji"/>
|
||||||
|
<MkTextarea v-model="preview_emoji"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.bold }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.boldDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_bold"/>
|
||||||
|
<MkTextarea v-model="preview_bold"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.small }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.smallDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_small"/>
|
||||||
|
<MkTextarea v-model="preview_small"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.quote }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.quoteDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_quote"/>
|
||||||
|
<MkTextarea v-model="preview_quote"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.center }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.centerDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_center"/>
|
||||||
|
<MkTextarea v-model="preview_center"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.inlineCode }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.inlineCodeDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_inlineCode"/>
|
||||||
|
<MkTextarea v-model="preview_inlineCode"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.blockCode }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.blockCodeDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_blockCode"/>
|
||||||
|
<MkTextarea v-model="preview_blockCode"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.inlineMath }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.inlineMathDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_inlineMath"/>
|
||||||
|
<MkTextarea v-model="preview_inlineMath"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- deprecated
|
||||||
<div class="section _block">
|
<div class="section _block">
|
||||||
<div class="title">{{ $ts._mfm.mention }}</div>
|
<div class="title">{{ $ts._mfm.search }}</div>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<p>{{ $ts._mfm.mentionDescription }}</p>
|
<p>{{ $ts._mfm.searchDescription }}</p>
|
||||||
<div class="preview">
|
<div class="preview">
|
||||||
<Mfm :text="preview_mention"/>
|
<Mfm :text="preview_search"/>
|
||||||
<MkTextarea v-model="preview_mention"><template #label>MFM</template></MkTextarea>
|
<MkTextarea v-model="preview_search"><template #label>MFM</template></MkTextarea>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="section _block">
|
-->
|
||||||
<div class="title">{{ $ts._mfm.hashtag }}</div>
|
<div class="section _block">
|
||||||
<div class="content">
|
<div class="title">{{ $ts._mfm.flip }}</div>
|
||||||
<p>{{ $ts._mfm.hashtagDescription }}</p>
|
<div class="content">
|
||||||
<div class="preview">
|
<p>{{ $ts._mfm.flipDescription }}</p>
|
||||||
<Mfm :text="preview_hashtag"/>
|
<div class="preview">
|
||||||
<MkTextarea v-model="preview_hashtag"><template #label>MFM</template></MkTextarea>
|
<Mfm :text="preview_flip"/>
|
||||||
|
<MkTextarea v-model="preview_flip"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.font }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.fontDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_font"/>
|
||||||
|
<MkTextarea v-model="preview_font"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.x2 }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.x2Description }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_x2"/>
|
||||||
|
<MkTextarea v-model="preview_x2"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.x3 }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.x3Description }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_x3"/>
|
||||||
|
<MkTextarea v-model="preview_x3"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.x4 }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.x4Description }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_x4"/>
|
||||||
|
<MkTextarea v-model="preview_x4"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.blur }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.blurDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_blur"/>
|
||||||
|
<MkTextarea v-model="preview_blur"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.jelly }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.jellyDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_jelly"/>
|
||||||
|
<MkTextarea v-model="preview_jelly"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.tada }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.tadaDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_tada"/>
|
||||||
|
<MkTextarea v-model="preview_tada"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.jump }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.jumpDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_jump"/>
|
||||||
|
<MkTextarea v-model="preview_jump"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.bounce }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.bounceDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_bounce"/>
|
||||||
|
<MkTextarea v-model="preview_bounce"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.spin }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.spinDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_spin"/>
|
||||||
|
<MkTextarea v-model="preview_spin"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.shake }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.shakeDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_shake"/>
|
||||||
|
<MkTextarea v-model="preview_shake"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.twitch }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.twitchDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_twitch"/>
|
||||||
|
<MkTextarea v-model="preview_twitch"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.rainbow }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.rainbowDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_rainbow"/>
|
||||||
|
<MkTextarea v-model="preview_rainbow"><template #label>MFM</template></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.sparkle }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.sparkleDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_sparkle"/>
|
||||||
|
<MkTextarea v-model="preview_sparkle"><span>MFM</span></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.rotate }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.rotateDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_rotate"/>
|
||||||
|
<MkTextarea v-model="preview_rotate"><span>MFM</span></MkTextarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="section _block">
|
||||||
|
<div class="title">{{ $ts._mfm.plain }}</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>{{ $ts._mfm.plainDescription }}</p>
|
||||||
|
<div class="preview">
|
||||||
|
<Mfm :text="preview_plain"/>
|
||||||
|
<MkTextarea v-model="preview_plain"><span>MFM</span></MkTextarea>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="section _block">
|
</MkSpacer>
|
||||||
<div class="title">{{ $ts._mfm.url }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.urlDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_url"/>
|
|
||||||
<MkTextarea v-model="preview_url"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.link }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.linkDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_link"/>
|
|
||||||
<MkTextarea v-model="preview_link"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.emoji }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.emojiDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_emoji"/>
|
|
||||||
<MkTextarea v-model="preview_emoji"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.bold }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.boldDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_bold"/>
|
|
||||||
<MkTextarea v-model="preview_bold"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.small }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.smallDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_small"/>
|
|
||||||
<MkTextarea v-model="preview_small"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.quote }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.quoteDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_quote"/>
|
|
||||||
<MkTextarea v-model="preview_quote"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.center }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.centerDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_center"/>
|
|
||||||
<MkTextarea v-model="preview_center"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.inlineCode }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.inlineCodeDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_inlineCode"/>
|
|
||||||
<MkTextarea v-model="preview_inlineCode"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.blockCode }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.blockCodeDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_blockCode"/>
|
|
||||||
<MkTextarea v-model="preview_blockCode"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.inlineMath }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.inlineMathDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_inlineMath"/>
|
|
||||||
<MkTextarea v-model="preview_inlineMath"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- deprecated
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.search }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.searchDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_search"/>
|
|
||||||
<MkTextarea v-model="preview_search"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
-->
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.flip }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.flipDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_flip"/>
|
|
||||||
<MkTextarea v-model="preview_flip"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.font }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.fontDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_font"/>
|
|
||||||
<MkTextarea v-model="preview_font"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.x2 }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.x2Description }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_x2"/>
|
|
||||||
<MkTextarea v-model="preview_x2"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.x3 }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.x3Description }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_x3"/>
|
|
||||||
<MkTextarea v-model="preview_x3"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.x4 }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.x4Description }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_x4"/>
|
|
||||||
<MkTextarea v-model="preview_x4"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.blur }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.blurDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_blur"/>
|
|
||||||
<MkTextarea v-model="preview_blur"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.jelly }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.jellyDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_jelly"/>
|
|
||||||
<MkTextarea v-model="preview_jelly"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.tada }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.tadaDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_tada"/>
|
|
||||||
<MkTextarea v-model="preview_tada"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.jump }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.jumpDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_jump"/>
|
|
||||||
<MkTextarea v-model="preview_jump"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.bounce }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.bounceDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_bounce"/>
|
|
||||||
<MkTextarea v-model="preview_bounce"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.spin }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.spinDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_spin"/>
|
|
||||||
<MkTextarea v-model="preview_spin"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.shake }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.shakeDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_shake"/>
|
|
||||||
<MkTextarea v-model="preview_shake"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.twitch }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.twitchDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_twitch"/>
|
|
||||||
<MkTextarea v-model="preview_twitch"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.rainbow }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.rainbowDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_rainbow"/>
|
|
||||||
<MkTextarea v-model="preview_rainbow"><template #label>MFM</template></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.sparkle }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.sparkleDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_sparkle"/>
|
|
||||||
<MkTextarea v-model="preview_sparkle"><span>MFM</span></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="section _block">
|
|
||||||
<div class="title">{{ $ts._mfm.rotate }}</div>
|
|
||||||
<div class="content">
|
|
||||||
<p>{{ $ts._mfm.rotateDescription }}</p>
|
|
||||||
<div class="preview">
|
|
||||||
<Mfm :text="preview_rotate"/>
|
|
||||||
<MkTextarea v-model="preview_rotate"><span>MFM</span></MkTextarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</MkStickyContainer>
|
</MkStickyContainer>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -306,35 +318,36 @@ import { definePageMetadata } from '@/scripts/page-metadata';
|
||||||
import { i18n } from '@/i18n';
|
import { i18n } from '@/i18n';
|
||||||
import { instance } from '@/instance';
|
import { instance } from '@/instance';
|
||||||
|
|
||||||
const preview_mention = '@example';
|
let preview_mention = $ref('@example');
|
||||||
const preview_hashtag = '#test';
|
let preview_hashtag = $ref('#test');
|
||||||
const preview_url = 'https://example.com';
|
let preview_url = $ref('https://example.com');
|
||||||
const preview_link = `[${i18n.ts._mfm.dummy}](https://example.com)`;
|
let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://example.com)`);
|
||||||
const preview_emoji = instance.emojis.length ? `:${instance.emojis[0].name}:` : ':emojiname:';
|
let preview_emoji = $ref(instance.emojis.length ? `:${instance.emojis[0].name}:` : ':emojiname:');
|
||||||
const preview_bold = `**${i18n.ts._mfm.dummy}**`;
|
let preview_bold = $ref(`**${i18n.ts._mfm.dummy}**`);
|
||||||
const preview_small = `<small>${i18n.ts._mfm.dummy}</small>`;
|
let preview_small = $ref(`<small>${i18n.ts._mfm.dummy}</small>`);
|
||||||
const preview_center = `<center>${i18n.ts._mfm.dummy}</center>`;
|
let preview_center = $ref(`<center>${i18n.ts._mfm.dummy}</center>`);
|
||||||
const preview_inlineCode = '`<: "Hello, world!"`';
|
let preview_inlineCode = $ref('`<: "Hello, world!"`');
|
||||||
const preview_blockCode = '```\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```';
|
let preview_blockCode = $ref('```\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```');
|
||||||
const preview_inlineMath = '\\(x= \\frac{-b\' \\pm \\sqrt{(b\')^2-ac}}{a}\\)';
|
let preview_inlineMath = $ref('\\(x= \\frac{-b\' \\pm \\sqrt{(b\')^2-ac}}{a}\\)');
|
||||||
const preview_quote = `> ${i18n.ts._mfm.dummy}`;
|
let preview_quote = $ref(`> ${i18n.ts._mfm.dummy}`);
|
||||||
const preview_search = `${i18n.ts._mfm.dummy} 検索`;
|
let preview_search = $ref(`${i18n.ts._mfm.dummy} 検索`);
|
||||||
const preview_jelly = '$[jelly 🍮] $[jelly.speed=5s 🍮]';
|
let preview_jelly = $ref('$[jelly 🍮] $[jelly.speed=5s 🍮]');
|
||||||
const preview_tada = '$[tada 🍮] $[tada.speed=5s 🍮]';
|
let preview_tada = $ref('$[tada 🍮] $[tada.speed=5s 🍮]');
|
||||||
const preview_jump = '$[jump 🍮] $[jump.speed=5s 🍮]';
|
let preview_jump = $ref('$[jump 🍮] $[jump.speed=5s 🍮]');
|
||||||
const preview_bounce = '$[bounce 🍮] $[bounce.speed=5s 🍮]';
|
let preview_bounce = $ref('$[bounce 🍮] $[bounce.speed=5s 🍮]');
|
||||||
const preview_shake = '$[shake 🍮] $[shake.speed=5s 🍮]';
|
let preview_shake = $ref('$[shake 🍮] $[shake.speed=5s 🍮]');
|
||||||
const preview_twitch = '$[twitch 🍮] $[twitch.speed=5s 🍮]';
|
let preview_twitch = $ref('$[twitch 🍮] $[twitch.speed=5s 🍮]');
|
||||||
const 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 🍮]\n\n$[spin.speed=5s 🍮]';
|
let preview_spin = $ref('$[spin 🍮] $[spin.left 🍮] $[spin.alternate 🍮]\n$[spin.x 🍮] $[spin.x,left 🍮] $[spin.x,alternate 🍮]\n$[spin.y 🍮] $[spin.y,left 🍮] $[spin.y,alternate 🍮]\n\n$[spin.speed=5s 🍮]');
|
||||||
const preview_flip = `$[flip ${i18n.ts._mfm.dummy}]\n$[flip.v ${i18n.ts._mfm.dummy}]\n$[flip.h,v ${i18n.ts._mfm.dummy}]`;
|
let preview_flip = $ref(`$[flip ${i18n.ts._mfm.dummy}]\n$[flip.v ${i18n.ts._mfm.dummy}]\n$[flip.h,v ${i18n.ts._mfm.dummy}]`);
|
||||||
const preview_font = `$[font.serif ${i18n.ts._mfm.dummy}]\n$[font.monospace ${i18n.ts._mfm.dummy}]\n$[font.cursive ${i18n.ts._mfm.dummy}]\n$[font.fantasy ${i18n.ts._mfm.dummy}]`;
|
let preview_font = $ref(`$[font.serif ${i18n.ts._mfm.dummy}]\n$[font.monospace ${i18n.ts._mfm.dummy}]\n$[font.cursive ${i18n.ts._mfm.dummy}]\n$[font.fantasy ${i18n.ts._mfm.dummy}]`);
|
||||||
const preview_x2 = '$[x2 🍮]';
|
let preview_x2 = $ref('$[x2 🍮]');
|
||||||
const preview_x3 = '$[x3 🍮]';
|
let preview_x3 = $ref('$[x3 🍮]');
|
||||||
const preview_x4 = '$[x4 🍮]';
|
let preview_x4 = $ref('$[x4 🍮]');
|
||||||
const preview_blur = `$[blur ${i18n.ts._mfm.dummy}]`;
|
let preview_blur = $ref(`$[blur ${i18n.ts._mfm.dummy}]`);
|
||||||
const preview_rainbow = '$[rainbow 🍮] $[rainbow.speed=5s 🍮]';
|
let preview_rainbow = $ref('$[rainbow 🍮] $[rainbow.speed=5s 🍮]');
|
||||||
const preview_sparkle = '$[sparkle 🍮]';
|
let preview_sparkle = $ref('$[sparkle 🍮]');
|
||||||
const preview_rotate = '$[rotate 🍮]';
|
let preview_rotate = $ref('$[rotate 🍮]');
|
||||||
|
let preview_plain = $ref('<plain>**bold** @mention #hashtag `code` $[x2 🍮]</plain>');
|
||||||
|
|
||||||
definePageMetadata({
|
definePageMetadata({
|
||||||
title: i18n.ts._mfm.cheatSheet,
|
title: i18n.ts._mfm.cheatSheet,
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ function fetchValue() {
|
||||||
async function save() {
|
async function save() {
|
||||||
try {
|
try {
|
||||||
JSON5.parse(valueForEditor);
|
JSON5.parse(valueForEditor);
|
||||||
} catch (e) {
|
} catch (err) {
|
||||||
os.alert({
|
os.alert({
|
||||||
type: 'error',
|
type: 'error',
|
||||||
text: i18n.ts.invalidValue,
|
text: i18n.ts.invalidValue,
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
</FormSection>
|
</FormSection>
|
||||||
|
|
||||||
<FormSection>
|
<FormSection>
|
||||||
<FormSwitch :value="$i.receiveAnnouncementEmail" @update:modelValue="onChangeReceiveAnnouncementEmail">
|
<FormSwitch :model-value="$i.receiveAnnouncementEmail" @update:modelValue="onChangeReceiveAnnouncementEmail">
|
||||||
{{ $ts.receiveAnnouncementFromInstance }}
|
{{ $ts.receiveAnnouncementFromInstance }}
|
||||||
</FormSwitch>
|
</FormSwitch>
|
||||||
</FormSection>
|
</FormSection>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
<div v-if="user">
|
<div v-if="user">
|
||||||
<XFollowList :user="user" type="followers"/>
|
<XFollowList :user="user" type="followers"/>
|
||||||
</div>
|
</div>
|
||||||
<MkError v-else-if="error" @retry="fetch()"/>
|
<MkError v-else-if="error" @retry="fetchUser()"/>
|
||||||
<MkLoading v-else/>
|
<MkLoading v-else/>
|
||||||
</transition>
|
</transition>
|
||||||
</MkSpacer>
|
</MkSpacer>
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
<div v-if="user">
|
<div v-if="user">
|
||||||
<XFollowList :user="user" type="following"/>
|
<XFollowList :user="user" type="following"/>
|
||||||
</div>
|
</div>
|
||||||
<MkError v-else-if="error" @retry="fetch()"/>
|
<MkError v-else-if="error" @retry="fetchUser()"/>
|
||||||
<MkLoading v-else/>
|
<MkLoading v-else/>
|
||||||
</transition>
|
</transition>
|
||||||
</MkSpacer>
|
</MkSpacer>
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<XPages v-else-if="tab === 'pages'" :user="user"/>
|
<XPages v-else-if="tab === 'pages'" :user="user"/>
|
||||||
<XGallery v-else-if="tab === 'gallery'" :user="user"/>
|
<XGallery v-else-if="tab === 'gallery'" :user="user"/>
|
||||||
</div>
|
</div>
|
||||||
<MkError v-else-if="error" @retry="fetch()"/>
|
<MkError v-else-if="error" @retry="fetchUser()"/>
|
||||||
<MkLoading v-else/>
|
<MkLoading v-else/>
|
||||||
</transition>
|
</transition>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -156,7 +156,7 @@ function more(ev: MouseEvent) {
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.mvcprjjd {
|
.mvcprjjd {
|
||||||
$nav-width: 250px;
|
$nav-width: 250px;
|
||||||
$nav-icon-only-width: 86px;
|
$nav-icon-only-width: 80px;
|
||||||
|
|
||||||
flex: 0 0 $nav-width;
|
flex: 0 0 $nav-width;
|
||||||
width: $nav-width;
|
width: $nav-width;
|
||||||
|
|
|
||||||
|
|
@ -600,10 +600,10 @@
|
||||||
resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
|
resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
|
||||||
integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
|
integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
|
||||||
|
|
||||||
"@vitejs/plugin-vue@3.0.0":
|
"@vitejs/plugin-vue@3.0.1":
|
||||||
version "3.0.0"
|
version "3.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.0.0.tgz#7081e2b3fbe04e291bb85107b9fb57a1fa5e6aeb"
|
resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.0.1.tgz#b6af8f782485374bbb5fe09edf067a845bf4caae"
|
||||||
integrity sha512-yWP34ArFh/jAeNUDkkLz/kVRLjf5ppJiq4L36f64Cp6dIrMQeYZGDP9xxdemlXfZR9ylN9JgHUl3GzfqOtgYDg==
|
integrity sha512-Ll9JgxG7ONIz/XZv3dssfoMUDu9qAnlJ+km+pBA0teYSXzwPCIzS/e1bmwNYl5dcQGs677D21amgfYAnzMl17A==
|
||||||
|
|
||||||
"@vue/compiler-core@3.2.37":
|
"@vue/compiler-core@3.2.37":
|
||||||
version "3.2.37"
|
version "3.2.37"
|
||||||
|
|
@ -4222,10 +4222,10 @@ verror@1.10.0:
|
||||||
core-util-is "1.0.2"
|
core-util-is "1.0.2"
|
||||||
extsprintf "^1.2.0"
|
extsprintf "^1.2.0"
|
||||||
|
|
||||||
vite@3.0.0:
|
vite@3.0.2:
|
||||||
version "3.0.0"
|
version "3.0.2"
|
||||||
resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.0.tgz#b4675cb9ab83ec0803b9c952ffa6519bcce033a7"
|
resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.2.tgz#2a7b4642c53ae066cf724e7e581d6c1fd24e2c32"
|
||||||
integrity sha512-M7phQhY3+fRZa0H+1WzI6N+/onruwPTBTMvaj7TzgZ0v2TE+N2sdLKxJOfOv9CckDWt5C4HmyQP81xB4dwRKzA==
|
integrity sha512-TAqydxW/w0U5AoL5AsD9DApTvGb2iNbGs3sN4u2VdT1GFkQVUfgUldt+t08TZgi23uIauh1TUOQJALduo9GXqw==
|
||||||
dependencies:
|
dependencies:
|
||||||
esbuild "^0.14.47"
|
esbuild "^0.14.47"
|
||||||
postcss "^8.4.14"
|
postcss "^8.4.14"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue