From 45413c9d28878fcb191eb735d5425be9f7cb4d4f Mon Sep 17 00:00:00 2001 From: 和風ドレッシング <37681609+CookieRamen@users.noreply.github.com> Date: Wed, 25 Mar 2020 15:57:35 +0900 Subject: Fix #6176 (#6183) --- src/client/pages/instance/users.vue | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/client') 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: '', -- cgit v1.2.3-freya From 998a59aa5ea454c78789e03790fc5d8bd8bec198 Mon Sep 17 00:00:00 2001 From: 和風ドレッシング <37681609+CookieRamen@users.noreply.github.com> Date: Wed, 25 Mar 2020 22:26:50 +0900 Subject: Fix #5986 (#6184) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix #5986 * Fix #5986 追加修正 --- src/client/components/signup.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/client') 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 @@ - {{ $t('tos') }} + {{ $t('tos') }}
-- cgit v1.2.3-freya From 8e9bd0bbd53e707fe4c6679a359a2caeb914e3ad Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 22:49:42 +0900 Subject: Fix dark mode sync bug --- src/client/init.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/client') 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, -- cgit v1.2.3-freya From 3489e4af1e98cad2014b1cd75995cbbbc71cc1dd Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 22:57:13 +0900 Subject: :art: --- src/client/app.vue | 15 ++++++++------- src/client/themes/_dark.json5 | 1 + src/client/themes/_light.json5 | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'src/client') 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/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', }, } -- cgit v1.2.3-freya From fae3b02e5a34e686e72b86055e628b4d8ba0470c Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 25 Mar 2020 23:15:08 +0900 Subject: :art: --- src/client/pages/about-misskey.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/client') diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue index 6b853d9e4a..3a826499eb 100644 --- a/src/client/pages/about-misskey.vue +++ b/src/client/pages/about-misskey.vue @@ -1,9 +1,14 @@