From 163a6fac002fef1cbc0a6c15fb966d65bfff456e Mon Sep 17 00:00:00 2001 From: fly_mc Date: Mon, 16 Sep 2024 23:52:08 +0800 Subject: [PATCH] themes and settings --- packages/frontend/src/store.ts | 6 ++++-- packages/frontend/src/themes/p-dark.json5 | 16 ++++++++-------- packages/frontend/src/themes/p-light.json5 | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts index 4f357883d..a832eb9a9 100644 --- a/packages/frontend/src/store.ts +++ b/packages/frontend/src/store.ts @@ -256,11 +256,13 @@ export const defaultStore = markRaw(new Storage('base', { }, useBlurEffectForModal: { where: 'device', - default: !/mobile|iphone|android/.test(navigator.userAgent.toLowerCase()), // 循環参照するのでdevice-kind.tsは参照できない + default: true, + //default: !/mobile|iphone|android/.test(navigator.userAgent.toLowerCase()), // 循環参照するのでdevice-kind.tsは参照できない }, useBlurEffect: { where: 'device', - default: !/mobile|iphone|android/.test(navigator.userAgent.toLowerCase()), // 循環参照するのでdevice-kind.tsは参照できない + default: true, + //default: !/mobile|iphone|android/.test(navigator.userAgent.toLowerCase()), // 循環参照するのでdevice-kind.tsは参照できない }, showFixedPostForm: { where: 'device', diff --git a/packages/frontend/src/themes/p-dark.json5 b/packages/frontend/src/themes/p-dark.json5 index fff477206..75f96f981 100644 --- a/packages/frontend/src/themes/p-dark.json5 +++ b/packages/frontend/src/themes/p-dark.json5 @@ -12,7 +12,7 @@ X7: 'rgba(255, 255, 255, 0.05)', X8: ':lighten<5<@accent', X9: ':darken<5<@accent', - bg: '#191724', + bg: ':alpha<0.8<#191724', fg: '#e0def4', X10: ':alpha<0.4<@accent', X11: 'rgba(0, 0, 0, 0.3)', @@ -28,19 +28,19 @@ warn: '#f6c177', badge: '#ebbcba', error: '#eb6f92', - focus: ':alpha<0.3<@accent', + focus: ':alpha<0.5<@accent', navBg: '@panel', navFg: '@fg', - panel: ':lighten<3<@bg', + panel: ':lighten<6<@bg', popup: ':lighten<3<@panel', accent: '#c4a7e7', - header: ':alpha<0.7<@panel', + header: '@panel', infoBg: '#253142', infoFg: '#fff', - renote: '#229e82', + renote: '#5d80f5', shadow: 'rgba(0, 0, 0, 0.3)', divider: 'rgba(255, 255, 255, 0.1)', - hashtag: '#ff9156', + hashtag: '#f1b1fa', mention: '@accent', modalBg: 'rgba(0, 0, 0, 0.5)', success: '#ebbcba', @@ -50,7 +50,7 @@ cwHoverBg: '#26233a', indicator: '@accent', mentionMe: '@mention', - messageBg: '@bg', + messageBg: ':alpha<0.6<@bg', navActive: '@accent', accentedBg: ':alpha<0.15<@accent', fgOnAccent: '#e0def4', @@ -71,7 +71,7 @@ panelHeaderBg: ':lighten<3<@panel', panelHeaderFg: '@fg', buttonGradateA: '@accent', - buttonGradateB: ':hue<20<@accent', + buttonGradateB: ':hue<25<@accent', htmlThemeColor: '@bg', panelHighlight: ':lighten<3<@panel', listItemHoverBg: 'rgba(255, 255, 255, 0.03)', diff --git a/packages/frontend/src/themes/p-light.json5 b/packages/frontend/src/themes/p-light.json5 index db1a3d285..49ef3be79 100644 --- a/packages/frontend/src/themes/p-light.json5 +++ b/packages/frontend/src/themes/p-light.json5 @@ -12,7 +12,7 @@ X7: 'rgba(255, 255, 255, 0.05)', X8: ':lighten<5<@accent', X9: ':darken<5<@accent', - bg: '#FFF9FB', + bg: ':alpha<0.9<#FFF9FB', fg: '#7f6666', X10: ':alpha<0.4<@accent', X11: 'rgba(0, 0, 0, 0.3)',