From 8b860cd744f37e9e5126c01b65da78c071f6c276 Mon Sep 17 00:00:00 2001 From: Aylam Date: Fri, 6 Oct 2023 19:01:20 +0300 Subject: [PATCH] Tweak default themes --- packages/client/src/style.scss | 8 +++--- packages/client/src/themes/d-iceshrimp.json5 | 27 ++++++++++++-------- packages/client/src/themes/l-iceshrimp.json5 | 11 +++++--- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss index 5cb3f9f6d..3fd3eb973 100644 --- a/packages/client/src/style.scss +++ b/packages/client/src/style.scss @@ -283,10 +283,10 @@ hr { transition: background 0.2s; } - &:hover:before, - &:focus::before, - &.highlighted::before { - background: var(--buttonBg); + &:hover, + &:focus, + &.highlighted { + background: var(--buttonHoverBg); } &:focus-visible::before { outline: auto; diff --git a/packages/client/src/themes/d-iceshrimp.json5 b/packages/client/src/themes/d-iceshrimp.json5 index 8d75ba034..70b136325 100644 --- a/packages/client/src/themes/d-iceshrimp.json5 +++ b/packages/client/src/themes/d-iceshrimp.json5 @@ -6,17 +6,24 @@ props: { fg: '#E7EDFF', bg: '#3B364C', - accent: '#9A92FF', - shadow: 'rgba(0, 0, 0, 0.3)', - fgOnAccent: '@bg', - panel: ':lighten<3<@bg', - panelActiveBg: ':darken<1.5<@bg', - panelActiveFg: '@fg', - panelHeaderBg: ':lighten<1<@bg', - panelHighlight: ':lighten<6<@panel', - hashtag: ':darken<6<#91c0ff', link: ':darken<6<#ff9891', + panel: ':lighten<3<@bg', + accent: '#9A92FF', + infoBg: ':lighten<6<@bg', infoFg: ':lighten<6<@fg', - infoBg: ':darken<3<@bg', + shadow: 'rgba(0, 0, 0, 0.3)', + hashtag: ':darken<6<#91c0ff', + buttonBg: '#4a4461', + fgOnAccent: '@bg', + buttonHoverBg: ':lighten<2<@buttonBg', + panelActiveBg: ':alpha<0.2<@accent', + panelActiveFg: '@fg', + panelHeaderBg: '@panel', + panelHeaderDivider: '@divider', + panelHighlight: ':lighten<6<@panel', + buttonGradateA: '@accent', + buttonGradateB: '#8372F5', + infoWarnBg: '#8a6700', + infoWarnFg: '#fff4ab', }, } diff --git a/packages/client/src/themes/l-iceshrimp.json5 b/packages/client/src/themes/l-iceshrimp.json5 index b8b755513..d7eea1d93 100644 --- a/packages/client/src/themes/l-iceshrimp.json5 +++ b/packages/client/src/themes/l-iceshrimp.json5 @@ -7,15 +7,18 @@ fg: '#3B364C', bg: '#E7EDFF', accent: '#9A92FF', - panel: ':lighten<3<@bg', - panelHeaderBg: ':lighten<1<@bg', + panel: ':lighten<2<@bg', + panelHeaderBg: '@panel', + panelHeaderDivider: '@divider', panelActiveFg: '@fg', - panelActiveBg: ':lighten<12<@accent', - panelHighlight: ':darken<3<@bg', + panelActiveBg: ':alpha<0.3<@accent', + panelHighlight: 'rgba(0, 0, 0, 0.1)', shadow: 'rgba(0, 0, 0, 0.1)', hashtag: ':darken<20<#91c0ff', link: ':darken<8<#ff9891', infoFg: ':lighten<6<@fg', infoBg: ':darken<6<@bg', + buttonGradateA: '@accent', + buttonGradateB: '#8372F5', }, }