diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue index d263fe8940..27cf807901 100644 --- a/packages/frontend/src/pages/about.vue +++ b/packages/frontend/src/pages/about.vue @@ -134,6 +134,13 @@ watch($$(tab), () => { let bannerUrl = ref(defaultStore.state.bannerUrl); let iconUrl = ref(defaultStore.state.iconUrl); const darkMode = computed(defaultStore.makeGetterSetter('darkMode')); +if (darkMode.value){ + bannerUrl.value = bannerDark; + iconUrl.value = iconDark; +}else{ + bannerUrl.value = bannerLight; + iconUrl.value = iconLight; +} watch(darkMode, () => { if (darkMode.value){ bannerUrl.value = bannerDark; diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 7635175289..23af670266 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -42,8 +42,8 @@ export const notePostInterruptors: NotePostInterruptor[] = []; export const pageViewInterruptors: PageViewInterruptor[] = []; export const bannerDark='https://files.prismisskey.space/misskey/ac141052-7a16-4608-bc08-263566326a6d.jpg' export const bannerLight ='https://files.prismisskey.space/misskey/e8d13afc-2348-4b13-a64a-f55a19e8d7aa.jpg' -export const iconDark='https://files.prismisskey.space/misskey/c7e56b1d-4c4f-408f-bf73-3175f4eb26ca.png' -export const iconLight='https://files.prismisskey.space/misskey/f3b3c9f8-ff2a-474d-a858-64ffe9023e22.png' +export const iconDark='https://files.prismisskey.space/misskey/f3b3c9f8-ff2a-474d-a858-64ffe9023e22.png' +export const iconLight='https://files.prismisskey.space/misskey/c7e56b1d-4c4f-408f-bf73-3175f4eb26ca.png' // TODO: それぞれいちいちwhereとかdefaultというキーを付けなきゃいけないの冗長なのでなんとかする(ただ型定義が面倒になりそう) diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue index 020a97d45c..597cfff73b 100644 --- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue +++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue @@ -57,6 +57,13 @@ import { instance } from '@/instance'; let bannerUrl = ref(defaultStore.state.bannerUrl); let iconUrl = ref(defaultStore.state.iconUrl); const darkMode = computed(defaultStore.makeGetterSetter('darkMode')); +if (darkMode.value){ + bannerUrl.value = bannerDark; + iconUrl.value = iconDark; +}else{ + bannerUrl.value = bannerLight; + iconUrl.value = iconLight; +} watch(darkMode, () => { if (darkMode.value){ bannerUrl.value = bannerDark; diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue index cbfcc1dd14..7c76c5fe6c 100644 --- a/packages/frontend/src/ui/_common_/navbar.vue +++ b/packages/frontend/src/ui/_common_/navbar.vue @@ -84,8 +84,16 @@ import {instance} from '@/instance'; const iconOnly = ref(false); let bannerUrl = ref(defaultStore.state.bannerUrl); -let iconUrl = ref(defaultStore.state.iconUrl); +let iconUrl = ref(); + const darkMode = computed(defaultStore.makeGetterSetter('darkMode')); +if (darkMode.value){ + bannerUrl.value = bannerDark; + iconUrl.value = iconDark; +}else{ + bannerUrl.value = bannerLight; + iconUrl.value = iconLight; +} watch(darkMode, () => { if (darkMode.value){ bannerUrl.value = bannerDark; @@ -167,7 +175,7 @@ function more(ev: MouseEvent) { top: 0; z-index: 1; padding: 20px 0; - background: var(--X14); + //background: var(--X14); -webkit-backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px)); } @@ -180,8 +188,8 @@ function more(ev: MouseEvent) { height: 100%; background-size: cover; background-position: center center; - -webkit-mask-image: linear-gradient(0deg, rgba(0, 0, 0, 0) 15%, rgba(0, 0, 0, 0.75) 100%); - mask-image: linear-gradient(0deg, rgba(0, 0, 0, 0) 15%, rgba(0, 0, 0, 0.75) 100%); + -webkit-mask-image: linear-gradient(0deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.75) 20%); + mask-image: linear-gradient(0deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.75) 20%); } .instance { diff --git a/packages/frontend/src/widgets/WidgetInstanceInfo.vue b/packages/frontend/src/widgets/WidgetInstanceInfo.vue index 36db872e9c..bef71dceff 100644 --- a/packages/frontend/src/widgets/WidgetInstanceInfo.vue +++ b/packages/frontend/src/widgets/WidgetInstanceInfo.vue @@ -31,6 +31,13 @@ const name = 'instanceInfo'; let bannerUrl = ref(defaultStore.state.bannerUrl); let iconUrl = ref(defaultStore.state.iconUrl); const darkMode = computed(defaultStore.makeGetterSetter('darkMode')); +if (darkMode.value){ + bannerUrl.value = bannerDark; + iconUrl.value = iconDark; +}else{ + bannerUrl.value = bannerLight; + iconUrl.value = iconLight; +} watch(darkMode, () => { if (darkMode.value){ bannerUrl.value = bannerDark;