Merge branch 'develop'

7 files changed, 30 insertions, 17 deletions

diff --git a/src/client/app.vue b/src/client/app.vue
index 650ebbd2b4..99268e42bf 100644
--- a/src/client/app.vue
+++ b/src/client/app.vue
@@ -895,24 +895,25 @@ export default Vue.extend({
 					color: var(--navActive);
 				}
 
-				&:first-child {
+				&:first-child, &:last-child {
 					position: sticky;
 					z-index: 1;
-					top: 0;
 					padding-top: 8px;
 					padding-bottom: 8px;
+					background: var(--wboyroyc);
+					-webkit-backdrop-filter: blur(8px);
+					backdrop-filter: blur(8px);
+				}
+
+				&:first-child {
+					top: 0;
 					margin-bottom: 16px;
-					background: var(--navBg);
 					border-bottom: solid 1px var(--divider);
 				}
 
 				&:last-child {
-					position: sticky;
 					bottom: 0;
-					padding-top: 8px;
-					padding-bottom: 8px;
 					margin-top: 16px;
-					background: var(--navBg);
 					border-top: solid 1px var(--divider);
 				}
 
diff --git a/src/client/components/signup.vue b/src/client/components/signup.vue
index 34765a7a26..9f3ae8db28 100644
--- a/src/client/components/signup.vue
+++ b/src/client/components/signup.vue
@@ -38,7 +38,7 @@
 		</mk-input>
 		<mk-switch v-model="ToSAgreement" v-if="meta.tosUrl">
 			<i18n path="agreeTo">
-				<a :href="meta.tosUrl" target="_blank">{{ $t('tos') }}</a>
+				<a :href="meta.tosUrl" class="_link" target="_blank">{{ $t('tos') }}</a>
 			</i18n>
 		</mk-switch>
 		<div v-if="meta.enableRecaptcha" class="g-recaptcha" :data-sitekey="meta.recaptchaSiteKey" style="margin: 16px 0;"></div>
diff --git a/src/client/init.ts b/src/client/init.ts
index b9c6aedae4..1fcd97190d 100644
--- a/src/client/init.ts
+++ b/src/client/init.ts
@@ -145,6 +145,12 @@ os.init(async () => {
 		}
 	}, false)
 
+	os.store.watch(state => state.device.darkMode, darkMode => {
+		// TODO: このファイルでbuiltinThemesを参照するとcode splittingが効かず、初回読み込み時に全てのテーマコードを読み込むことになってしまい無駄なので何とかする
+		const themes = builtinThemes.concat(os.store.state.device.themes);
+		applyTheme(themes.find(x => x.id === (darkMode ? os.store.state.device.darkTheme : os.store.state.device.lightTheme)));
+	});
+
 	//#region Sync dark mode
 	if (os.store.state.device.syncDeviceDarkMode) {
 		os.store.commit('device/set', { key: 'darkMode', value: isDeviceDarkmode() });
@@ -176,13 +182,6 @@ os.init(async () => {
 				isMobile: isMobile
 			};
 		},
-		watch: {
-			'$store.state.device.darkMode'() {
-				// TODO: このファイルでbuiltinThemesを参照するとcode splittingが効かず、初回読み込み時に全てのテーマコードを読み込むことになってしまい無駄なので何とかする
-				const themes = builtinThemes.concat(this.$store.state.device.themes);
-				applyTheme(themes.find(x => x.id === (this.$store.state.device.darkMode ? this.$store.state.device.darkTheme : this.$store.state.device.lightTheme)));
-			}
-		},
 		methods: {
 			api: os.api,
 			signout: os.signout,
diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue
index 6b853d9e4a..84cd5d5e9c 100644
--- a/src/client/pages/about-misskey.vue
+++ b/src/client/pages/about-misskey.vue
@@ -1,9 +1,14 @@
 <template>
 <div class="znqjceqz">
-	<portal to="title">🍀 {{ $t('aboutMisskey') }}</portal>
+	<portal to="title">{{ $t('aboutMisskey') }}</portal>
 
 	<section class="_card">
-		<div class="_title">🍀 {{ $t('aboutMisskey') }}</div>
+		<div class="_title">{{ $t('aboutMisskey') }}</div>
+		<div class="_content" style="text-align: center;">
+			<img src="/assets/icons/512.png" alt="" style="display: block; width: 100px; margin: 0 auto; border-radius: 16px;"/>
+			<div style="margin-top: 0.75em;">Misskey</div>
+			<div style="opacity: 0.5;">v{{ version }}</div>
+		</div>
 		<div class="_content">
 			<div style="margin-bottom: 1em;">{{ $t('aboutMisskeyText') }}</div>
 			<div>🛠️ {{ $t('misskeyMembers') }}</div>
@@ -44,6 +49,9 @@
 				<li>wara</li>
 				<li>Takashi Shibuya</li>
 				<li>Noizeman</li>
+				<li>mydarkstar</li>
+				<li>nenohi</li>
+				<li>Eduardo Quiros</li>
 			</ul>
 			<span>{{ $t('morePatrons') }}</span>
 		</div>
diff --git a/src/client/pages/instance/users.vue b/src/client/pages/instance/users.vue
index 2341c51988..db9e625e4c 100644
--- a/src/client/pages/instance/users.vue
+++ b/src/client/pages/instance/users.vue
@@ -64,6 +64,9 @@ export default Vue.extend({
 			pagination: {
 				endpoint: 'admin/show-users',
 				limit: 10,
+				params: () => ({
+					sort: '+createdAt'
+				}),
 				offsetMode: true
 			},
 			target: '',
diff --git a/src/client/themes/_dark.json5 b/src/client/themes/_dark.json5
index bc7c0efc09..b059d53be2 100644
--- a/src/client/themes/_dark.json5
+++ b/src/client/themes/_dark.json5
@@ -65,5 +65,6 @@
 		aupeazdm: 'rgba(0, 0, 0, 0.3)',
 		jvhmlskx: 'rgba(255, 255, 255, 0.1)',
 		yakfpmhl: 'rgba(255, 255, 255, 0.15)',
+		wboyroyc: ':alpha<0.5<@navBg',
 	},
 }
diff --git a/src/client/themes/_light.json5 b/src/client/themes/_light.json5
index adb1280420..dea1b335c1 100644
--- a/src/client/themes/_light.json5
+++ b/src/client/themes/_light.json5
@@ -65,5 +65,6 @@
 		aupeazdm: 'rgba(0, 0, 0, 0.1)',
 		jvhmlskx: 'rgba(0, 0, 0, 0.1)',
 		yakfpmhl: 'rgba(0, 0, 0, 0.15)',
+		wboyroyc: ':alpha<0.5<@navBg',
 	},
 }