summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--locales/index.d.ts26
-rw-r--r--locales/ja-JP.yml14
-rw-r--r--packages/frontend-shared/themes/_dark.json51
-rw-r--r--packages/frontend-shared/themes/_light.json51
-rw-r--r--packages/frontend-shared/themes/d-astro.json51
-rw-r--r--packages/frontend-shared/themes/d-u0.json51
-rw-r--r--packages/frontend-shared/themes/l-u0.json51
-rw-r--r--packages/frontend-shared/themes/l-vivid.json51
-rw-r--r--packages/frontend/src/ui/_common_/navbar-for-mobile.vue2
-rw-r--r--packages/frontend/src/ui/_common_/navbar-h.vue2
-rw-r--r--packages/frontend/src/ui/_common_/navbar.vue2
11 files changed, 13 insertions, 39 deletions
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 4d3e4e73ce..2c64a6d373 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -8235,23 +8235,19 @@ export interface Locale extends ILocale {
*/
"header": string;
/**
- * サイドバーの背景
+ * ナビゲーションバーの背景
*/
"navBg": string;
/**
- * サイドバーの文字
+ * ナビゲーションバーの文字
*/
"navFg": string;
/**
- * サイドバー文字(ホバー)
- */
- "navHoverFg": string;
- /**
- * サイドバー文字(アクティブ)
+ * ナビゲーションバー文字(アクティブ)
*/
"navActive": string;
/**
- * サイドバーのインジケーター
+ * ナビゲーションバーのインジケーター
*/
"navIndicator": string;
/**
@@ -8271,7 +8267,7 @@ export interface Locale extends ILocale {
*/
"mentionMe": string;
/**
- * Renote
+ * リノート
*/
"renote": string;
/**
@@ -8335,10 +8331,6 @@ export interface Locale extends ILocale {
*/
"driveFolderBg": string;
/**
- * 壁紙のオーバーレイ
- */
- "wallpaperOverlay": string;
- /**
* バッジ
*/
"badge": string;
@@ -8347,14 +8339,6 @@ export interface Locale extends ILocale {
*/
"messageBg": string;
/**
- * アクセント (暗め)
- */
- "accentDarken": string;
- /**
- * アクセント (明るめ)
- */
- "accentLighten": string;
- /**
* 強調された文字
*/
"fgHighlighted": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 639b094a81..322506965c 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2161,16 +2161,15 @@ _theme:
panel: "パネル"
shadow: "影"
header: "ヘッダー"
- navBg: "サイドバーの背景"
- navFg: "サイドバーの文字"
- navHoverFg: "サイドバー文字(ホバー)"
- navActive: "サイドバー文字(アクティブ)"
- navIndicator: "サイドバーのインジケーター"
+ navBg: "ナビゲーションバーの背景"
+ navFg: "ナビゲーションバーの文字"
+ navActive: "ナビゲーションバー文字(アクティブ)"
+ navIndicator: "ナビゲーションバーのインジケーター"
link: "リンク"
hashtag: "ハッシュタグ"
mention: "メンション"
mentionMe: "あなた宛てメンション"
- renote: "Renote"
+ renote: "リノート"
modalBg: "モーダルの背景"
divider: "分割線"
scrollbarHandle: "スクロールバーの取っ手"
@@ -2186,11 +2185,8 @@ _theme:
buttonHoverBg: "ボタンの背景 (ホバー)"
inputBorder: "入力ボックスの縁取り"
driveFolderBg: "ドライブフォルダーの背景"
- wallpaperOverlay: "壁紙のオーバーレイ"
badge: "バッジ"
messageBg: "チャットの背景"
- accentDarken: "アクセント (暗め)"
- accentLighten: "アクセント (明るめ)"
fgHighlighted: "強調された文字"
_sfx:
diff --git a/packages/frontend-shared/themes/_dark.json5 b/packages/frontend-shared/themes/_dark.json5
index d960e627ef..cefc5edb72 100644
--- a/packages/frontend-shared/themes/_dark.json5
+++ b/packages/frontend-shared/themes/_dark.json5
@@ -34,7 +34,6 @@
header: ':alpha<0.7<@panel',
navBg: '@panel',
navFg: '@fg',
- navHoverFg: ':lighten<17<@fg',
navActive: '@accent',
navIndicator: '@indicator',
link: '#44a4c1',
diff --git a/packages/frontend-shared/themes/_light.json5 b/packages/frontend-shared/themes/_light.json5
index 90912df3e3..25e6e5ab7f 100644
--- a/packages/frontend-shared/themes/_light.json5
+++ b/packages/frontend-shared/themes/_light.json5
@@ -34,7 +34,6 @@
header: ':alpha<0.7<@panel',
navBg: '@panel',
navFg: '@fg',
- navHoverFg: ':darken<17<@fg',
navActive: '@accent',
navIndicator: '@indicator',
link: '#44a4c1',
diff --git a/packages/frontend-shared/themes/d-astro.json5 b/packages/frontend-shared/themes/d-astro.json5
index c2792d2e9f..48839241bd 100644
--- a/packages/frontend-shared/themes/d-astro.json5
+++ b/packages/frontend-shared/themes/d-astro.json5
@@ -31,7 +31,6 @@
navActive: '@accent',
infoWarnBg: '#42321c',
infoWarnFg: '#ffbd3e',
- navHoverFg: ':lighten<17<@fg',
dateLabelFg: '@fg',
inputBorder: 'rgba(255, 255, 255, 0.1)',
inputBorderHover: 'rgba(255, 255, 255, 0.2)',
diff --git a/packages/frontend-shared/themes/d-u0.json5 b/packages/frontend-shared/themes/d-u0.json5
index e1bda175dd..ddce06649c 100644
--- a/packages/frontend-shared/themes/d-u0.json5
+++ b/packages/frontend-shared/themes/d-u0.json5
@@ -42,7 +42,6 @@
fgOnWhite: '@accent',
infoWarnBg: '#42321c',
infoWarnFg: '#ffbd3e',
- navHoverFg: ':lighten<17<@fg',
codeBoolean: '#c59eff',
dateLabelFg: '@fg',
inputBorder: 'rgba(255, 255, 255, 0.1)',
diff --git a/packages/frontend-shared/themes/l-u0.json5 b/packages/frontend-shared/themes/l-u0.json5
index c76ae3a9c6..d8e403c961 100644
--- a/packages/frontend-shared/themes/l-u0.json5
+++ b/packages/frontend-shared/themes/l-u0.json5
@@ -43,7 +43,6 @@
fgOnWhite: '@accent',
infoWarnBg: '#42321c',
infoWarnFg: '#ffbd3e',
- navHoverFg: ':lighten<17<@fg',
codeBoolean: '#c59eff',
dateLabelFg: '@fg',
inputBorder: 'rgba(255, 255, 255, 0.1)',
diff --git a/packages/frontend-shared/themes/l-vivid.json5 b/packages/frontend-shared/themes/l-vivid.json5
index dbd725e35f..d69f024a6b 100644
--- a/packages/frontend-shared/themes/l-vivid.json5
+++ b/packages/frontend-shared/themes/l-vivid.json5
@@ -34,7 +34,6 @@
navActive: '@accent',
infoWarnBg: '#fff0db',
infoWarnFg: '#8f6e31',
- navHoverFg: ':darken<17<@fg',
dateLabelFg: '@fg',
inputBorder: 'rgba(0, 0, 0, 0.1)',
inputBorderHover: 'rgba(0, 0, 0, 0.2)',
diff --git a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
index 6acfde5b89..b5098563bd 100644
--- a/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
+++ b/packages/frontend/src/ui/_common_/navbar-for-mobile.vue
@@ -221,7 +221,7 @@ function more() {
&:hover {
text-decoration: none;
- color: var(--MI_THEME-navHoverFg);
+ color: light-dark(hsl(from var(--MI_THEME-navFg) h s calc(l - 17)), hsl(from var(--MI_THEME-navFg) h s calc(l + 17)));
}
&.active {
diff --git a/packages/frontend/src/ui/_common_/navbar-h.vue b/packages/frontend/src/ui/_common_/navbar-h.vue
index c93935dd26..13fc592e70 100644
--- a/packages/frontend/src/ui/_common_/navbar-h.vue
+++ b/packages/frontend/src/ui/_common_/navbar-h.vue
@@ -149,7 +149,7 @@ onMounted(() => {
&:hover {
text-decoration: none;
- color: var(--MI_THEME-navHoverFg);
+ color: light-dark(hsl(from var(--MI_THEME-navFg) h s calc(l - 17)), hsl(from var(--MI_THEME-navFg) h s calc(l + 17)));
}
&.active {
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index fbb604ba8e..faab2704a7 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -456,7 +456,7 @@ function menuEdit() {
&:hover {
text-decoration: none;
- color: var(--MI_THEME-navHoverFg);
+ color: light-dark(hsl(from var(--MI_THEME-navFg) h s calc(l - 17)), hsl(from var(--MI_THEME-navFg) h s calc(l + 17)));
}
&.active {