diff --git a/packages/frontend/src/components/global/MkPageHeader.vue b/packages/frontend/src/components/global/MkPageHeader.vue index 5c78a38a08..8defe7568a 100644 --- a/packages/frontend/src/components/global/MkPageHeader.vue +++ b/packages/frontend/src/components/global/MkPageHeader.vue @@ -110,7 +110,7 @@ function onTabClick(): void { } const calcBg = () => { - const rawBg = 'var(--bg)'; + const rawBg = 'var(--headerBg)'; const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg); if (isFriendly.value && isMobile.value) tinyBg.setAlpha(1); else tinyBg.setAlpha(0.85); @@ -144,7 +144,7 @@ onUnmounted(() => { .root { -webkit-backdrop-filter: var(--blur, blur(15px)); backdrop-filter: var(--blur, blur(15px)); - border-bottom: solid 0.5px var(--divider); + // border-bottom: solid 0.5px var(--divider); width: 100%; transition: opacity 0.5s, transform 0.5s; diff --git a/packages/frontend/src/themes/_dark.json5 b/packages/frontend/src/themes/_dark.json5 index ff51531356..73a861294c 100644 --- a/packages/frontend/src/themes/_dark.json5 +++ b/packages/frontend/src/themes/_dark.json5 @@ -34,6 +34,7 @@ popup: ':lighten<3<@panel', shadow: 'rgba(0, 0, 0, 0.3)', header: ':alpha<0.7<@panel', + headerBg: '#000', navBg: '@panel', navFg: '@fg', navHoverFg: ':lighten<17<@fg', diff --git a/packages/frontend/src/themes/_light.json5 b/packages/frontend/src/themes/_light.json5 index 670562ef4b..5c4081138d 100644 --- a/packages/frontend/src/themes/_light.json5 +++ b/packages/frontend/src/themes/_light.json5 @@ -34,6 +34,7 @@ popup: ':lighten<3<@panel', shadow: 'rgba(0, 0, 0, 0.1)', header: ':alpha<0.7<@panel', + headerBg: '#fff', navBg: '@panel', navFg: '@fg', navHoverFg: ':darken<17<@fg', diff --git a/packages/frontend/src/themes/d-astro.json5 b/packages/frontend/src/themes/d-astro.json5 index c6a927ec3a..12eb467dbc 100644 --- a/packages/frontend/src/themes/d-astro.json5 +++ b/packages/frontend/src/themes/d-astro.json5 @@ -18,6 +18,7 @@ panel: '#2a272b', accent: '#81c08b', header: ':alpha<0.7<@bg', + headerBg: "@bg", infoBg: '#253142', infoFg: '#fff', renote: '#659CC8', diff --git a/packages/frontend/src/themes/d-birdsite.json5 b/packages/frontend/src/themes/d-birdsite.json5 index f02e6090d0..8f0f5aaefb 100644 --- a/packages/frontend/src/themes/d-birdsite.json5 +++ b/packages/frontend/src/themes/d-birdsite.json5 @@ -8,6 +8,7 @@ bg: '#000', link: '#1d9bf0', hashtag: '#1d9bf0', + headerBg: "@bg", renote: '#71767b', buttonGradateA: '@accent', buttonGradateB: '@accent', diff --git a/packages/frontend/src/themes/d-botanical.json5 b/packages/frontend/src/themes/d-botanical.json5 index 33cf7aa817..1efd9654a2 100644 --- a/packages/frontend/src/themes/d-botanical.json5 +++ b/packages/frontend/src/themes/d-botanical.json5 @@ -15,6 +15,7 @@ panel: 'rgb(47, 47, 44)', panelHeaderDivider: 'rgba(0, 0, 0, 0)', header: ':alpha<0.7<@panel', + headerBg: "@bg", navBg: '#363636', renote: '@accent', mention: 'rgb(212, 153, 76)', diff --git a/packages/frontend/src/themes/d-cherry.json5 b/packages/frontend/src/themes/d-cherry.json5 index a7e1ad1c80..16146a7919 100644 --- a/packages/frontend/src/themes/d-cherry.json5 +++ b/packages/frontend/src/themes/d-cherry.json5 @@ -11,6 +11,7 @@ bg: 'rgb(28, 28, 37)', fg: 'rgb(236, 239, 244)', panel: 'rgb(35, 35, 47)', + headerBg: "@bg", renote: '@accent', link: '@accent', mention: '@accent', diff --git a/packages/frontend/src/themes/d-cherrypick.json5 b/packages/frontend/src/themes/d-cherrypick.json5 index 14d7bba985..3e5f04d495 100644 --- a/packages/frontend/src/themes/d-cherrypick.json5 +++ b/packages/frontend/src/themes/d-cherrypick.json5 @@ -11,12 +11,12 @@ fgHighlighted: '#fff', divider: 'rgb(63, 63, 80)', panel: 'rgb(35, 35, 47)', - panelHeaderBg: '@panel', - panelHeaderDivider: '@divider', + panelHeaderBg: 'rgb(45, 45, 66)', infoFg: '@accent', infoBg: 'rgb(0, 0, 0)', acrylicPanel: ':alpha<0.5<@panel', header: '@bg', + headerBg: 'rgb(32, 32, 43)', navBg: '@panel', navHoverFg: '@pick', renote: '@accent', diff --git a/packages/frontend/src/themes/d-dark.json5 b/packages/frontend/src/themes/d-dark.json5 index 63144e88ea..49c21179a5 100644 --- a/packages/frontend/src/themes/d-dark.json5 +++ b/packages/frontend/src/themes/d-dark.json5 @@ -15,6 +15,7 @@ panel: '#2d2d2d', panelHeaderDivider: 'rgba(0, 0, 0, 0)', header: ':alpha<0.7<@panel', + headerBg: "@bg", navBg: '#363636', renote: '@accent', mention: '#da6d35', diff --git a/packages/frontend/src/themes/d-future.json5 b/packages/frontend/src/themes/d-future.json5 index 0962a12411..f8562f4eb9 100644 --- a/packages/frontend/src/themes/d-future.json5 +++ b/packages/frontend/src/themes/d-future.json5 @@ -15,6 +15,7 @@ divider: 'rgba(255, 255, 255, 0.1)', panel: '#18181c', panelHeaderDivider: 'rgba(0, 0, 0, 0)', + headerBg: "@bg", renote: '@accent', mention: '#f2c97d', mentionMe: '@accent', diff --git a/packages/frontend/src/themes/d-green-lime.json5 b/packages/frontend/src/themes/d-green-lime.json5 index 9522f534a4..e2bea70633 100644 --- a/packages/frontend/src/themes/d-green-lime.json5 +++ b/packages/frontend/src/themes/d-green-lime.json5 @@ -16,6 +16,7 @@ panel: '#192320', panelHeaderDivider: 'rgba(0, 0, 0, 0)', popup: '#293330', + headerBg: "@bg", renote: '@accent', mentionMe: '#ffaa00', link: '#24d7ce', diff --git a/packages/frontend/src/themes/d-green-orange.json5 b/packages/frontend/src/themes/d-green-orange.json5 index e542782c66..49e396f647 100644 --- a/packages/frontend/src/themes/d-green-orange.json5 +++ b/packages/frontend/src/themes/d-green-orange.json5 @@ -16,6 +16,7 @@ panel: '#192320', panelHeaderDivider: 'rgba(0, 0, 0, 0)', popup: '#293330', + headerBg: "@bg", renote: '@accent', mentionMe: '#b4e900', link: '#24d7ce', diff --git a/packages/frontend/src/themes/d-ice.json5 b/packages/frontend/src/themes/d-ice.json5 index 179b060dcf..3aca54e9ab 100644 --- a/packages/frontend/src/themes/d-ice.json5 +++ b/packages/frontend/src/themes/d-ice.json5 @@ -9,5 +9,6 @@ props: { accent: '#47BFE8', bg: '#212526', + headerBg: "@bg" }, } diff --git a/packages/frontend/src/themes/d-persimmon.json5 b/packages/frontend/src/themes/d-persimmon.json5 index e36265ff10..61266e9b58 100644 --- a/packages/frontend/src/themes/d-persimmon.json5 +++ b/packages/frontend/src/themes/d-persimmon.json5 @@ -15,6 +15,7 @@ panel: 'rgb(41, 43, 41)', infoFg: '@fg', infoBg: '#333c3b', + headerBg: "@bg", navBg: '#141714', renote: '@accent', mention: '@accent', diff --git a/packages/frontend/src/themes/d-qdon.json5 b/packages/frontend/src/themes/d-qdon.json5 index 20fc884bc0..6616e6c614 100644 --- a/packages/frontend/src/themes/d-qdon.json5 +++ b/packages/frontend/src/themes/d-qdon.json5 @@ -30,6 +30,7 @@ link: '$qdonL1', hashtag: '#87ceeb', mention: '$mstdnHyperLink', + headerBg: "@bg", renote: '$mstdnHyperLink', cwBg: '#5e6781', cwFg: '$mstdnUI', diff --git a/packages/frontend/src/themes/d-u0.json5 b/packages/frontend/src/themes/d-u0.json5 index 3fce93b2fe..8f1dc5f2b2 100644 --- a/packages/frontend/src/themes/d-u0.json5 +++ b/packages/frontend/src/themes/d-u0.json5 @@ -34,6 +34,7 @@ popup: ':lighten<3<@panel', accent: '#00a497', header: ':alpha<0.7<@panel', + headerBg: "@bg", infoBg: '#253142', infoFg: '#fff', renote: '@accent', diff --git a/packages/frontend/src/themes/l-apricot.json5 b/packages/frontend/src/themes/l-apricot.json5 index 1ed5525575..1356fcc156 100644 --- a/packages/frontend/src/themes/l-apricot.json5 +++ b/packages/frontend/src/themes/l-apricot.json5 @@ -11,6 +11,7 @@ bg: '#e6e5e2', fg: 'rgb(149, 143, 139)', panel: '#EEECE8', + headerBg: "@bg", renote: '@accent', link: '@accent', mention: '@accent', diff --git a/packages/frontend/src/themes/l-birdsite.json5 b/packages/frontend/src/themes/l-birdsite.json5 index 156cdcf93d..09c2aba964 100644 --- a/packages/frontend/src/themes/l-birdsite.json5 +++ b/packages/frontend/src/themes/l-birdsite.json5 @@ -7,6 +7,7 @@ bg: '#fff', link: '#1d9bf0', accent: '#1d9bf0', + headerBg: "@bg", renote: '#536472', hashtag: '#1d9bf0', buttonGradateA: '@accent', diff --git a/packages/frontend/src/themes/l-botanical.json5 b/packages/frontend/src/themes/l-botanical.json5 index 2ea9a7d6c9..e6dd7edc9e 100644 --- a/packages/frontend/src/themes/l-botanical.json5 +++ b/packages/frontend/src/themes/l-botanical.json5 @@ -16,6 +16,7 @@ panelHeaderBg: '@panel', panelHeaderDivider: '@divider', header: ':alpha<0.7<@panel', + headerBg: "@bg", navBg: '@X14', renote: '#229e92', mention: '#da6d35', diff --git a/packages/frontend/src/themes/l-cherry.json5 b/packages/frontend/src/themes/l-cherry.json5 index 5ad240241e..05c1dcb7ba 100644 --- a/packages/frontend/src/themes/l-cherry.json5 +++ b/packages/frontend/src/themes/l-cherry.json5 @@ -11,6 +11,7 @@ bg: 'rgb(254, 248, 249)', fg: 'rgb(152, 13, 26)', panel: 'rgb(255, 255, 255)', + headerBg: "@bg", renote: '@accent', link: 'rgb(156, 187, 5)', mention: '@accent', diff --git a/packages/frontend/src/themes/l-cherrypick.json5 b/packages/frontend/src/themes/l-cherrypick.json5 index 0a5a33e885..a21f69a6f8 100644 --- a/packages/frontend/src/themes/l-cherrypick.json5 +++ b/packages/frontend/src/themes/l-cherrypick.json5 @@ -7,15 +7,15 @@ props: { accent: '#6ba5e3', - bg: '#f6f9ff', + bg: 'rgb(238, 241, 252)', fg: '#577096', divider: 'rgb(223, 223, 223)', acrylicPanel: ':alpha<0.5<@panel', header: '@bg', + headerBg: 'rgb(246, 249, 255)', navBg: '#eff4ff', navHoverFg: '@pick', - panel: '#fff', - panelHeaderDivider: '@divider', + panel: 'rgb(246, 249, 255)', messageBg: '#dedede', }, } diff --git a/packages/frontend/src/themes/l-coffee.json5 b/packages/frontend/src/themes/l-coffee.json5 index fbcd4fa9ef..c44677fb50 100644 --- a/packages/frontend/src/themes/l-coffee.json5 +++ b/packages/frontend/src/themes/l-coffee.json5 @@ -12,6 +12,7 @@ fg: '#7f6666', panel: '#fff', divider: 'rgba(87, 68, 68, 0.1)', + headerBg: "@bg", renote: 'rgb(160, 172, 125)', link: 'rgb(137, 151, 159)', mention: '@accent', diff --git a/packages/frontend/src/themes/l-light.json5 b/packages/frontend/src/themes/l-light.json5 index 248355c945..e44715b239 100644 --- a/packages/frontend/src/themes/l-light.json5 +++ b/packages/frontend/src/themes/l-light.json5 @@ -12,6 +12,7 @@ fg: '#676767', divider: '#e8e8e8', header: ':alpha<0.7<@panel', + headerBg: "@bg", navBg: '#fff', panel: '#fff', panelHeaderDivider: '@divider', diff --git a/packages/frontend/src/themes/l-rainy.json5 b/packages/frontend/src/themes/l-rainy.json5 index 283dd74c6c..a7f48ce903 100644 --- a/packages/frontend/src/themes/l-rainy.json5 +++ b/packages/frontend/src/themes/l-rainy.json5 @@ -13,6 +13,7 @@ panel: '#fff', divider: 'rgb(230 233 234)', panelHeaderDivider: '@divider', + headerBg: "@bg", renote: '@accent', link: '@accent', mention: '@accent', diff --git a/packages/frontend/src/themes/l-sushi.json5 b/packages/frontend/src/themes/l-sushi.json5 index 5846927d65..0a16c87cb3 100644 --- a/packages/frontend/src/themes/l-sushi.json5 +++ b/packages/frontend/src/themes/l-sushi.json5 @@ -11,6 +11,7 @@ bg: '#f0eee9', fg: '#5f5f5f', renote: '@accent', + headerBg: "@bg", link: '@accent', mention: '@accent', hashtag: '#229e82', diff --git a/packages/frontend/src/themes/l-u0.json5 b/packages/frontend/src/themes/l-u0.json5 index 03b114ba39..a03c98c58b 100644 --- a/packages/frontend/src/themes/l-u0.json5 +++ b/packages/frontend/src/themes/l-u0.json5 @@ -34,6 +34,7 @@ popup: ':lighten<3<@panel', accent: '#478384', header: ':alpha<0.7<@panel', + headerBg: "@bg", infoBg: '#253142', infoFg: '#fff', renote: '@accent', diff --git a/packages/frontend/src/themes/l-vivid.json5 b/packages/frontend/src/themes/l-vivid.json5 index b3c08f38ae..2636ff63e0 100644 --- a/packages/frontend/src/themes/l-vivid.json5 +++ b/packages/frontend/src/themes/l-vivid.json5 @@ -21,6 +21,7 @@ panel: '#fff', accent: '#008cff', header: ':alpha<0.7<@panel', + headerBg: "@bg", infoBg: '#e5f5ff', infoFg: '#72818a', renote: '@accent',