diff --git a/packages/client/src/components/launch-pad.vue b/packages/client/src/components/launch-pad.vue index 2733903cb..4ee705d3a 100644 --- a/packages/client/src/components/launch-pad.vue +++ b/packages/client/src/components/launch-pad.vue @@ -3,30 +3,28 @@
-
{{ i18n.ts.instanceInfo }}
+ {{ i18n.ts.instanceInfo }}
-
{{ i18n.ts.aboutMisskey }}
+ {{ i18n.ts.aboutMisskey }}
@@ -66,7 +64,7 @@ const items = Object.keys(menuDef).filter(k => !menu.includes(k)).map(k => menuD icon: def.icon, to: def.to, action: def.action, - indicate: def.indicated, + indicated: def.indicated, })); function close() { @@ -141,25 +139,11 @@ function help(ev: MouseEvent) { height: 24px; } - > .text { + > span { margin-top: 12px; font-size: 0.8em; line-height: 1.5em; } - - > .indicator { - position: absolute; - top: 32px; - left: 32px; - color: var(--indicator); - font-size: 8px; - animation: blink 1s infinite; - - @media (max-width: 500px) { - top: 16px; - left: 16px; - } - } } } diff --git a/packages/client/src/components/ui/menu.vue b/packages/client/src/components/ui/menu.vue index 29359ef35..7824da238 100644 --- a/packages/client/src/components/ui/menu.vue +++ b/packages/client/src/components/ui/menu.vue @@ -14,29 +14,25 @@ - + {{ item.text }} - - + {{ item.text }} - - {{ item.text }} - @@ -236,15 +232,6 @@ function focusDown() { width: 20px; height: 20px; } - - > .indicator { - position: absolute; - top: 5px; - left: 13px; - color: var(--indicator); - font-size: 12px; - animation: blink 1s infinite; - } } > .divider { diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss index f96b0e63f..6dbbe688f 100644 --- a/packages/client/src/style.scss +++ b/packages/client/src/style.scss @@ -481,10 +481,14 @@ hr { transform: scale(0.9); } -@keyframes blink { - 0% { opacity: 1; transform: scale(1); } - 30% { opacity: 1; transform: scale(1); } - 90% { opacity: 0; transform: scale(0.5); } +.indicated { + i { + color: var(--indicator); + filter: saturate(2); + } + span { + font-weight: bold; + } } @keyframes tada { diff --git a/packages/client/src/themes/_dark.json5 b/packages/client/src/themes/_dark.json5 index cda66a508..2ebaf6aee 100644 --- a/packages/client/src/themes/_dark.json5 +++ b/packages/client/src/themes/_dark.json5 @@ -35,7 +35,6 @@ navFg: '@fg', navHoverFg: ':lighten<17<@fg', navActive: '@accent', - navIndicator: '@indicator', link: '#44a4c1', hashtag: '#ff9156', mention: '@accent', diff --git a/packages/client/src/themes/_light.json5 b/packages/client/src/themes/_light.json5 index 50c5388e0..3066964e8 100644 --- a/packages/client/src/themes/_light.json5 +++ b/packages/client/src/themes/_light.json5 @@ -35,7 +35,6 @@ navFg: '@fg', navHoverFg: ':darken<17<@fg', navActive: '@accent', - navIndicator: '@indicator', link: '#44a4c1', hashtag: '#ff9156', mention: '@accent', diff --git a/packages/client/src/themes/d-astro.json5 b/packages/client/src/themes/d-astro.json5 index 7b9034020..7e67cf1dc 100644 --- a/packages/client/src/themes/d-astro.json5 +++ b/packages/client/src/themes/d-astro.json5 @@ -41,7 +41,6 @@ inputBorderHover: 'rgba(255, 255, 255, 0.2)', panelBorder: '" solid 1px var(--divider)', accentDarken: ':darken<10<@accent', - navIndicator: '@accent', accentLighten: ':lighten<10<@accent', buttonHoverBg: 'rgba(255, 255, 255, 0.1)', buttonGradateA: '@accent', diff --git a/packages/client/src/themes/d-pumpkin.json5 b/packages/client/src/themes/d-pumpkin.json5 index ff2bc9509..2f6552412 100644 --- a/packages/client/src/themes/d-pumpkin.json5 +++ b/packages/client/src/themes/d-pumpkin.json5 @@ -63,7 +63,6 @@ inputBorder: 'rgba(255, 255, 255, 0.1)', panelBorder: '" solid 1px var(--divider)', accentDarken: ':darken<10<@accent', - navIndicator: '@indicator', accentLighten: ':lighten<10<@accent', buttonHoverBg: 'rgba(255, 255, 255, 0.1)', driveFolderBg: ':alpha<0.3<@accent', diff --git a/packages/client/src/themes/l-vivid.json5 b/packages/client/src/themes/l-vivid.json5 index 66d97f3a0..c0e013c41 100644 --- a/packages/client/src/themes/l-vivid.json5 +++ b/packages/client/src/themes/l-vivid.json5 @@ -44,7 +44,6 @@ inputBorderHover: 'rgba(0, 0, 0, 0.2)', panelBorder: '" solid 1px var(--divider)', accentDarken: ':darken<10<@accent', - navIndicator: '@accent', accentLighten: ':lighten<10<@accent', buttonHoverBg: 'rgba(0, 0, 0, 0.1)', driveFolderBg: ':alpha<0.3<@accent', diff --git a/packages/client/src/ui/_common_/sidebar-for-mobile.vue b/packages/client/src/ui/_common_/sidebar-for-mobile.vue index 88d5c0bf4..96322287b 100644 --- a/packages/client/src/ui/_common_/sidebar-for-mobile.vue +++ b/packages/client/src/ui/_common_/sidebar-for-mobile.vue @@ -9,24 +9,27 @@
- {{ i18n.ts.controlPanel }} + + {{ i18n.ts.controlPanel }} - - {{ i18n.ts.settings }} + + {{ i18n.ts.settings }} @@ -104,15 +107,6 @@ function more(): void { vertical-align: middle; } - > .indicator { - position: absolute; - top: 0; - left: 20px; - color: var(--navIndicator); - font-size: 8px; - animation: blink 1s infinite; - } - > .text { position: relative; font-size: 0.9em; diff --git a/packages/client/src/ui/_common_/sidebar.vue b/packages/client/src/ui/_common_/sidebar.vue index e3912df40..78b0f79b0 100644 --- a/packages/client/src/ui/_common_/sidebar.vue +++ b/packages/client/src/ui/_common_/sidebar.vue @@ -9,24 +9,27 @@
- {{ i18n.ts.controlPanel }} + + {{ i18n.ts.controlPanel }} - - {{ i18n.ts.settings }} + + {{ i18n.ts.settings }} @@ -137,15 +140,6 @@ function more(ev: MouseEvent) { vertical-align: middle; } - > .indicator { - position: absolute; - top: 0; - left: 20px; - color: var(--navIndicator); - font-size: 8px; - animation: blink 1s infinite; - } - > .text { position: relative; font-size: 0.9em; diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue index 41d861661..13a9c4333 100644 --- a/packages/client/src/ui/classic.header.vue +++ b/packages/client/src/ui/classic.header.vue @@ -7,18 +7,16 @@
-
@@ -129,15 +127,6 @@ function openAccountMenuWrapper(ev: MouseEvent): void { vertical-align: middle; } - > .indicator { - position: absolute; - top: 0; - left: 0; - color: var(--navIndicator); - font-size: 8px; - animation: blink 1s infinite; - } - &:hover { text-decoration: none; color: var(--navHoverFg); diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue index 00177ba15..489216f21 100644 --- a/packages/client/src/ui/classic.sidebar.vue +++ b/packages/client/src/ui/classic.sidebar.vue @@ -14,18 +14,18 @@
{{ i18n.ts.controlPanel }} - {{ i18n.ts.settings }} @@ -214,15 +214,6 @@ function openAccountMenuWrapper(ev: MouseEvent): void { vertical-align: middle; } - > .indicator { - position: absolute; - top: 0; - left: 0; - color: var(--navIndicator); - font-size: 8px; - animation: blink 1s infinite; - } - &:hover { text-decoration: none; color: var(--navHoverFg); diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue index b3b9ddd55..a5d4eebcf 100644 --- a/packages/client/src/ui/deck.vue +++ b/packages/client/src/ui/deck.vue @@ -27,10 +27,18 @@
- - - - + + + +
@@ -245,15 +253,6 @@ function moveFocus(id: string, direction: 'up' | 'down' | 'left' | 'right') { background: var(--X2); } - > .indicator { - position: absolute; - top: 0; - left: 0; - color: var(--indicator); - font-size: 16px; - animation: blink 1s infinite; - } - &:first-child { margin-left: 0; } diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index 8abcecd62..bc1ed33c8 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -18,11 +18,21 @@
- - - - - + + + + +
@@ -344,15 +354,6 @@ const wallpaper = localStorage.getItem('wallpaper') != null; background: var(--X2); } - > .indicator { - position: absolute; - top: 0; - left: 0; - color: var(--indicator); - font-size: 16px; - animation: blink 1s infinite; - } - &:first-child { margin-left: 0; }