Merge branch 'develop'

8 files changed, 57 insertions, 26 deletions

diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue
index 1d57c80810..f7b9245fcc 100644
--- a/src/client/pages/about-misskey.vue
+++ b/src/client/pages/about-misskey.vue
@@ -68,40 +68,58 @@ import * as symbols from '@client/symbols';
 const patrons = [
 	'Satsuki Yanagi',
 	'noellabo',
-	'Gargron',
-	'Atsuko Tominaga',
+	'mametsuko',
 	'AureoleArk',
-	'naga_rus',
-	'Melilot',
-	'Hekovic',
+	'Gargron',
 	'Nokotaro Takeda',
-	'dansup',
+	'Suji Yan',
+	'Hekovic',
+	'Gitmo Life Services',
 	'nenohi',
-	'motcha',
+	'naga_rus',
+	'Melilot',
+	'Efertone',
+	'oi_yekssim',
 	'nanami kan',
-	'Eduardo Quiros',
-	'Peter G.',
+	'motcha',
+	'dansup',
+	'Quinton Macejkovic',
 	'YUKIMOCHI',
-	'Efertone',
-	'makokunsan',
 	'mewl hayabusa',
+	'makokunsan',
+	'Peter G.',
+	'Nesakko',
+	'regtan',
 	'見当かなみ',
 	'natalie',
+	'Jerry',
 	'takimura',
 	'sikyosyounin',
-	'weepjp',
-	'mydarkstar',
-	'Nesakko',
+	'YuzuRyo61',
 	'sheeta.s',
 	'osapon',
-	'YuzuRyo61',
-	'wara',
 	'mkatze',
-	'kiritan',
 	'CG',
+	'nafuchoco',
+	'Takumi Sugita',
+	'chidori ninokura',
+	'mydarkstar',
+	'kiritan',
+	'kabo2468y',
+	'weepjp',
+	'Liaizon Wakest',
+	'Steffen K9',
+	'Roujo',
+	'uroco @99',
+	'totokoro',
+	'public_yusuke',
+	'wara',
+	'S Y',
 	'Denshi',
 	'Osushimaru',
-	'Liaizon Wakest',
+	'吴浥',
+	'DignifiedSilence',
+	't_w',
 ];
 
 export default defineComponent({
diff --git a/src/client/pages/channel.vue b/src/client/pages/channel.vue
index 1504264af5..d725db9e49 100644
--- a/src/client/pages/channel.vue
+++ b/src/client/pages/channel.vue
@@ -152,8 +152,8 @@ export default defineComponent({
 		left: 0;
 		width: 100%;
 		height: 100%;
-		-webkit-backdrop-filter: blur(16px);
-		backdrop-filter: blur(16px);
+		-webkit-backdrop-filter: var(--blur, blur(16px));
+		backdrop-filter: var(--blur, blur(16px));
 		background: rgba(0, 0, 0, 0.3);
 	}
 
diff --git a/src/client/pages/doc.vue b/src/client/pages/doc.vue
index af3f56abcb..500d0340b7 100644
--- a/src/client/pages/doc.vue
+++ b/src/client/pages/doc.vue
@@ -5,6 +5,7 @@
 		<div class="body" v-html="body"></div>
 		<div class="footer">
 			<MkLink :url="`https://github.com/misskey-dev/misskey/blob/master/src/docs/${lang}/${doc}.md`" class="at">{{ $ts.docSource }}</MkLink>
+			<p v-if="lang !== 'ja-JP'">{{ $ts.translateWarn }}</p>
 		</div>
 	</div>
 </div>
diff --git a/src/client/pages/mfm-cheat-sheet.vue b/src/client/pages/mfm-cheat-sheet.vue
index 751dccd7a1..95ddc1cbd1 100644
--- a/src/client/pages/mfm-cheat-sheet.vue
+++ b/src/client/pages/mfm-cheat-sheet.vue
@@ -333,8 +333,8 @@ export default defineComponent({
 			top: var(--stickyTop, 0px);
 			padding: 16px;
 			font-weight: bold;
-			-webkit-backdrop-filter: blur(10px);
-			backdrop-filter: blur(10px);
+			-webkit-backdrop-filter: var(--blur, blur(10px));
+			backdrop-filter: var(--blur, blur(10px));
 			background-color: var(--X16);
 		}
 
diff --git a/src/client/pages/my-lists/index.vue b/src/client/pages/my-lists/index.vue
index e92f11c7d0..7de31bb308 100644
--- a/src/client/pages/my-lists/index.vue
+++ b/src/client/pages/my-lists/index.vue
@@ -3,7 +3,10 @@
 	<MkButton @click="create" primary class="add"><i class="fas fa-plus"></i> {{ $ts.createList }}</MkButton>
 
 	<MkPagination :pagination="pagination" #default="{items}" class="lists _content" ref="list">
-		<MkA v-for="(list, i) in items" :key="list.id" class="list _panel" :to="`/my/lists/${ list.id }`">{{ list.name }}</MkA>
+		<MkA v-for="list in items" :key="list.id" class="list _panel" :to="`/my/lists/${ list.id }`">
+			<div class="name">{{ list.name }}</div>
+			<MkAvatars :user-ids="list.userIds"/>
+		</MkA>
 	</MkPagination>
 </div>
 </template>
@@ -12,6 +15,7 @@
 import { defineComponent } from 'vue';
 import MkPagination from '@client/components/ui/pagination.vue';
 import MkButton from '@client/components/ui/button.vue';
+import MkAvatars from '@client/components/avatars.vue';
 import * as os from '@client/os';
 import * as symbols from '@client/symbols';
 
@@ -19,6 +23,7 @@ export default defineComponent({
 	components: {
 		MkPagination,
 		MkButton,
+		MkAvatars,
 	},
 
 	data() {
@@ -63,7 +68,7 @@ export default defineComponent({
 
 	> .lists {
 		> .list {
-			display: flex;
+			display: block;
 			padding: 16px;
 			border: solid 1px var(--divider);
 			border-radius: 6px;
@@ -72,6 +77,10 @@ export default defineComponent({
 				border: solid 1px var(--accent);
 				text-decoration: none;
 			}
+
+			> .name {
+				margin-bottom: 4px;
+			}
 		}
 	}
 }
diff --git a/src/client/pages/settings/general.vue b/src/client/pages/settings/general.vue
index cc40d2be98..cfa8107d28 100644
--- a/src/client/pages/settings/general.vue
+++ b/src/client/pages/settings/general.vue
@@ -33,6 +33,7 @@
 		<template #label>{{ $ts.appearance }}</template>
 		<FormSwitch v-model:value="disableAnimatedMfm">{{ $ts.disableAnimatedMfm }}</FormSwitch>
 		<FormSwitch v-model:value="reduceAnimation">{{ $ts.reduceUiAnimation }}</FormSwitch>
+		<FormSwitch v-model:value="useBlurEffect">{{ $ts.useBlurEffect }}</FormSwitch>
 		<FormSwitch v-model:value="useBlurEffectForModal">{{ $ts.useBlurEffectForModal }}</FormSwitch>
 		<FormSwitch v-model:value="showGapBetweenNotesInTimeline">{{ $ts.showGapBetweenNotesInTimeline }}</FormSwitch>
 		<FormSwitch v-model:value="loadRawImages">{{ $ts.loadRawImages }}</FormSwitch>
@@ -132,6 +133,7 @@ export default defineComponent({
 		serverDisconnectedBehavior: defaultStore.makeGetterSetter('serverDisconnectedBehavior'),
 		reduceAnimation: defaultStore.makeGetterSetter('animation', v => !v, v => !v),
 		useBlurEffectForModal: defaultStore.makeGetterSetter('useBlurEffectForModal'),
+		useBlurEffect: defaultStore.makeGetterSetter('useBlurEffect'),
 		showGapBetweenNotesInTimeline: defaultStore.makeGetterSetter('showGapBetweenNotesInTimeline'),
 		disableAnimatedMfm: defaultStore.makeGetterSetter('animatedMfm', v => !v, v => !v),
 		useOsNativeEmojis: defaultStore.makeGetterSetter('useOsNativeEmojis'),
diff --git a/src/client/pages/user/index.vue b/src/client/pages/user/index.vue
index 9cf424b127..4145c86d56 100644
--- a/src/client/pages/user/index.vue
+++ b/src/client/pages/user/index.vue
@@ -613,8 +613,8 @@ export default defineComponent({
 					position: absolute;
 					top: 12px;
 					right: 12px;
-					-webkit-backdrop-filter: blur(8px);
-					backdrop-filter: blur(8px);
+					-webkit-backdrop-filter: var(--blur, blur(8px));
+					backdrop-filter: var(--blur, blur(8px));
 					background: rgba(0, 0, 0, 0.2);
 					padding: 8px;
 					border-radius: 24px;
diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue
index 299271c347..7d49ddd7d7 100644
--- a/src/client/pages/welcome.entrance.a.vue
+++ b/src/client/pages/welcome.entrance.a.vue
@@ -260,6 +260,7 @@ export default defineComponent({
 					display: block;
 					margin: 0;
 					padding: 32px 32px 24px 32px;
+					font-size: 1.5em;
 
 					> .logo {
 						vertical-align: bottom;