From 6d6e556dfa1eb597b33b3150ea9b7c6489fbbf67 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 1 Jun 2023 14:25:54 +0900 Subject: [PATCH] =?UTF-8?q?fix(client):=20=E3=83=86=E3=83=BC=E3=83=9E?= =?UTF-8?q?=E3=81=AE=E4=BA=92=E6=8F=9B=E6=80=A7=E3=81=8C=E4=BD=8E=E4=B8=8B?= =?UTF-8?q?=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG_CHERRYPICK.md | 1 + packages/frontend/src/themes/_dark.json5 | 13 ++++++------- packages/frontend/src/themes/_light.json5 | 11 +++++------ packages/frontend/src/themes/d-astro.json5 | 2 +- packages/frontend/src/themes/d-cherrypick.json5 | 15 ++++++++++----- packages/frontend/src/themes/d-u0.json5 | 2 +- packages/frontend/src/themes/l-cherrypick.json5 | 5 ++++- packages/frontend/src/themes/l-u0.json5 | 2 +- packages/frontend/src/themes/l-vivid.json5 | 2 +- 9 files changed, 30 insertions(+), 23 deletions(-) diff --git a/CHANGELOG_CHERRYPICK.md b/CHANGELOG_CHERRYPICK.md index d1edf82bfa..1771045747 100644 --- a/CHANGELOG_CHERRYPICK.md +++ b/CHANGELOG_CHERRYPICK.md @@ -61,6 +61,7 @@ - Fix: 노트 작성 폼의 프로필 아이콘 여백 조정 - Fix: 새 노트 알림이 프로필 아이콘을 밀어내는 문제 - Fix: 리노트 알림에 프로필 아이콘이 뜨는 문제 +- Fix: 테마의 호환성이 저하되는 문제 --- diff --git a/packages/frontend/src/themes/_dark.json5 b/packages/frontend/src/themes/_dark.json5 index 993a627d7f..c4a688c684 100644 --- a/packages/frontend/src/themes/_dark.json5 +++ b/packages/frontend/src/themes/_dark.json5 @@ -4,12 +4,12 @@ id: 'dark', name: 'Dark', - author: 'noridev', + author: 'noridev & syuilo', desc: 'CherryPick default dark theme', kind: 'dark', props: { - accent: '#ffc5e6', + accent: '#86b300', accentDarken: ':darken<10<@accent', accentLighten: ':lighten<10<@accent', accentedBg: ':alpha<0.15<@accent', @@ -21,7 +21,6 @@ fgTransparent: ':alpha<0.5<@fg', fgHighlighted: ':lighten<3<@fg', fgOnAccent: '#fff', - fgOnWhite: '#333', divider: 'rgba(255, 255, 255, 0.1)', indicator: '@accent', panel: ':lighten<3<@bg', @@ -44,7 +43,7 @@ hashtag: '#ff9156', mention: '@accent', mentionMe: '@mention', - renote: '@accent', + renote: '#229e82', renoteHover: ':lighten<5<@renote', nameHover: ':darken<5<@fg', modalBg: 'rgba(0, 0, 0, 0.5)', @@ -61,8 +60,8 @@ cwHoverBg: '#707b97', buttonBg: 'rgba(255, 255, 255, 0.05)', buttonHoverBg: 'rgba(255, 255, 255, 0.1)', - buttonGradateA: '@cherry', - buttonGradateB: '@pick', + buttonGradateA: '@accent', + buttonGradateB: ':hue<20<@accent', switchOffBg: 'rgba(255, 255, 255, 0.1)', switchOffFg: ':alpha<0.8<@fg', switchOnBg: '@accentedBg', @@ -72,7 +71,7 @@ listItemHoverBg: 'rgba(255, 255, 255, 0.03)', driveFolderBg: ':alpha<0.3<@accent', wallpaperOverlay: 'rgba(0, 0, 0, 0.5)', - badge: '#ffa9c3', + badge: '#afd2ff', patron: '#a3faff', messageBg: '@bg', success: '#86b300', diff --git a/packages/frontend/src/themes/_light.json5 b/packages/frontend/src/themes/_light.json5 index 3ccca72692..c40e313a8c 100644 --- a/packages/frontend/src/themes/_light.json5 +++ b/packages/frontend/src/themes/_light.json5 @@ -4,12 +4,12 @@ id: 'light', name: 'Light', - author: 'noridev', + author: 'noridev & syuilo', desc: 'CherryPick default light theme', kind: 'light', props: { - accent: '#ffa9c3', + accent: '#86b300', accentDarken: ':darken<10<@accent', accentLighten: ':lighten<10<@accent', accentedBg: ':alpha<0.15<@accent', @@ -21,7 +21,6 @@ fgTransparent: ':alpha<0.5<@fg', fgHighlighted: ':darken<3<@fg', fgOnAccent: '#fff', - fgOnWhite: '#333', divider: 'rgba(0, 0, 0, 0.1)', indicator: '@accent', panel: ':lighten<3<@bg', @@ -61,8 +60,8 @@ cwHoverBg: '#bbc4ce', buttonBg: 'rgba(0, 0, 0, 0.05)', buttonHoverBg: 'rgba(0, 0, 0, 0.1)', - buttonGradateA: '@cherry', - buttonGradateB: '@pick', + buttonGradateA: '@accent', + buttonGradateB: ':hue<20<@accent', switchOffBg: 'rgba(0, 0, 0, 0.1)', switchOffFg: '@panel', switchOnBg: '@accent', @@ -72,7 +71,7 @@ listItemHoverBg: 'rgba(0, 0, 0, 0.03)', driveFolderBg: ':alpha<0.3<@accent', wallpaperOverlay: 'rgba(255, 255, 255, 0.5)', - badge: '#ffa9c3', + badge: '#ffbcdc', patron: '#a3faff', messageBg: '@bg', success: '#86b300', diff --git a/packages/frontend/src/themes/d-astro.json5 b/packages/frontend/src/themes/d-astro.json5 index 09a9ead1a2..e3c3e806cc 100644 --- a/packages/frontend/src/themes/d-astro.json5 +++ b/packages/frontend/src/themes/d-astro.json5 @@ -10,7 +10,7 @@ cwFg: '#393f4f', link: '#78b0a0', warn: '#ecb637', - badge: '#31b1ce', + badge: '#afd2ff', error: '#ec4137', focus: ':alpha<0.3<@accent', navBg: '@panel', diff --git a/packages/frontend/src/themes/d-cherrypick.json5 b/packages/frontend/src/themes/d-cherrypick.json5 index 4b8b1796d1..13c11dfbe6 100644 --- a/packages/frontend/src/themes/d-cherrypick.json5 +++ b/packages/frontend/src/themes/d-cherrypick.json5 @@ -6,23 +6,28 @@ desc: 'CherryPick default dark theme', props: { + accent: '#ffc5e6', bg: 'rgb(28, 28, 37)', fg: 'rgb(236, 239, 244)', fgHighlighted: '#fff', + fgOnAccent: '#000', fgOnWhite: '@accent', divider: 'rgb(63, 63, 80)', panel: 'rgb(35, 35, 47)', panelHeaderBg: 'rgb(45, 45, 66)', - infoFg: '@accent', - infoBg: 'rgb(0, 0, 0)', acrylicPanel: ':alpha<0.5<@panel', header: '@bg', navBg: '@panel', navHoverFg: '@pick', - renote: '@accent', + link: '@accent', + hashtag: '#4cb8d4', mention: '#da6d35', mentionMe: '#d44c4c', - hashtag: '#4cb8d4', - link: '@accent', + renote: '@accent', + infoFg: '@accent', + infoBg: 'rgb(0, 0, 0)', + buttonGradateA: '@cherry', + buttonGradateB: '@pick', + badge: '#ffa9c3', }, } diff --git a/packages/frontend/src/themes/d-u0.json5 b/packages/frontend/src/themes/d-u0.json5 index ed776746a8..6e5199161e 100644 --- a/packages/frontend/src/themes/d-u0.json5 +++ b/packages/frontend/src/themes/d-u0.json5 @@ -25,7 +25,7 @@ cwFg: '#393f4f', link: '@accent', warn: '#ecb637', - badge: '#31b1ce', + badge: '#afd2ff', error: '#ec4137', focus: ':alpha<0.3<@accent', navBg: '@panel', diff --git a/packages/frontend/src/themes/l-cherrypick.json5 b/packages/frontend/src/themes/l-cherrypick.json5 index 091a9e0cce..1994a00593 100644 --- a/packages/frontend/src/themes/l-cherrypick.json5 +++ b/packages/frontend/src/themes/l-cherrypick.json5 @@ -11,11 +11,14 @@ fg: '#577096', fgOnWhite: '@accent', divider: 'rgb(223, 223, 223)', + panel: 'rgb(246, 249, 255)', acrylicPanel: ':alpha<0.5<@panel', header: '@bg', navBg: '#eff4ff', navHoverFg: '@pick', - panel: 'rgb(246, 249, 255)', + buttonGradateA: '@cherry', + buttonGradateB: '@pick', + badge: '#ffa9c3', messageBg: '#dedede', }, } diff --git a/packages/frontend/src/themes/l-u0.json5 b/packages/frontend/src/themes/l-u0.json5 index b77b15e3f0..116dbb4a01 100644 --- a/packages/frontend/src/themes/l-u0.json5 +++ b/packages/frontend/src/themes/l-u0.json5 @@ -25,7 +25,7 @@ cwFg: '#393f4f', link: '@accent', warn: '#ecb637', - badge: '#31b1ce', + badge: '#afd2ff', error: '#ec4137', focus: ':alpha<0.3<@accent', navBg: '@panel', diff --git a/packages/frontend/src/themes/l-vivid.json5 b/packages/frontend/src/themes/l-vivid.json5 index 822ef948dd..54dcaf05a5 100644 --- a/packages/frontend/src/themes/l-vivid.json5 +++ b/packages/frontend/src/themes/l-vivid.json5 @@ -13,7 +13,7 @@ cwFg: '#fff', link: '#ff9400', warn: '#ecb637', - badge: '#31b1ce', + badge: '#afd2ff', error: '#ec4137', focus: ':alpha<0.3<@accent', navBg: '@panel',