From 473355a5d9563aa01c6d2ec7f05035b4b0858942 Mon Sep 17 00:00:00 2001 From: mattyatea Date: Sat, 23 Sep 2023 19:10:51 +0900 Subject: [PATCH] fix --- packages/frontend/src/components/MkButton.vue | 6 +- .../src/components/MkFollowButton.vue | 14 +++-- packages/frontend/src/components/MkMenu.vue | 12 ++-- .../frontend/src/components/MkPostForm.vue | 20 +++---- .../components/MkReactionsViewer.reaction.vue | 5 +- packages/frontend/src/components/MkSwitch.vue | 2 +- packages/frontend/src/components/MkTab.vue | 2 + packages/frontend/src/store.ts | 4 +- .../src/ui/_common_/navbar-for-mobile.vue | 2 +- packages/frontend/src/ui/_common_/navbar.vue | 55 +++++++++++++------ 10 files changed, 75 insertions(+), 47 deletions(-) diff --git a/packages/frontend/src/components/MkButton.vue b/packages/frontend/src/components/MkButton.vue index 6bd59b3906..94eab89ba9 100644 --- a/packages/frontend/src/components/MkButton.vue +++ b/packages/frontend/src/components/MkButton.vue @@ -319,7 +319,7 @@ function onMousedown(evt: MouseEvent): void { &.gamingDark { background: linear-gradient(270deg, #e7a2a2, #e3cfa2, #ebefa1, #b3e7a6, #a6ebe7, #aec5e3, #cabded, #e0b9e3, #f4bddd); background-size: 1800% 1800%; - color: white !important; + color: black; -webkit-animation: AnimationDark 44s cubic-bezier(0, 0.45, 0.30, 1) infinite; -moz-animation: AnimationDark 44s cubic-bezier(0, 0.45, 0.30, 1) infinite; animation: AnimationDark 44s cubic-bezier(0, 0.45, 0.30, 1) infinite; @@ -327,7 +327,7 @@ function onMousedown(evt: MouseEvent): void { &:not(:disabled):hover { background: linear-gradient(270deg, #e7a2a2, #e3cfa2, #ebefa1, #b3e7a6, #a6ebe7, #aec5e3, #cabded, #e0b9e3, #f4bddd); background-size: 1800% 1800% ; - color: white !important; + color: black; -webkit-animation: AnimationDark 45s cubic-bezier(0, 0.45, 0.30, 1) infinite ; -moz-animation: AnimationDark 45s cubic-bezier(0, 0.45, 0.30, 1) infinite; animation: AnimationDark 45s cubic-bezier(0, 0.45, 0.30, 1) infinite ; @@ -336,7 +336,7 @@ function onMousedown(evt: MouseEvent): void { &:not(:disabled):active { background: linear-gradient(270deg, #e7a2a2, #e3cfa2, #ebefa1, #b3e7a6, #a6ebe7, #aec5e3, #cabded, #e0b9e3, #f4bddd); background-size: 1800% 1800% !important; - color: white !important; + color: black; -webkit-animation: AnimationDark 45s cubic-bezier(0, 0.45, 0.30, 1) infinite ; -moz-animation: AnimationDark 45s cubic-bezier(0, 0.45, 0.30, 1) infinite; animation: AnimationDark 45s cubic-bezier(0, 0.45, 0.30, 1) infinite; diff --git a/packages/frontend/src/components/MkFollowButton.vue b/packages/frontend/src/components/MkFollowButton.vue index f7cf3f2abb..c68bf96a0f 100644 --- a/packages/frontend/src/components/MkFollowButton.vue +++ b/packages/frontend/src/components/MkFollowButton.vue @@ -205,7 +205,7 @@ onBeforeUnmount(() => { -webkit-animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; -moz-animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; - + border: solid 1px black; } &.gamingLight { @@ -215,6 +215,7 @@ onBeforeUnmount(() => { -webkit-animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; -moz-animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; + border: solid 1px white; } &.full { @@ -293,6 +294,7 @@ onBeforeUnmount(() => { -webkit-animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; -moz-animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; + border: solid 1px white; } &.gamingDark:active { @@ -302,7 +304,7 @@ onBeforeUnmount(() => { -webkit-animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; -moz-animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; - border-color: black; + border: solid 1px white; } &.gamingLight:hover { @@ -311,7 +313,7 @@ onBeforeUnmount(() => { -webkit-animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; -moz-animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; - border-color: black; + border: solid 1px white; } &.gamingLight:active { @@ -321,12 +323,13 @@ onBeforeUnmount(() => { -webkit-animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; -moz-animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; - border-color: black; + border: solid 1px white; } &.gamingDark { -webkit-text-fill-color: unset !important; color: black; + border: solid 1px white; background: linear-gradient(270deg, #e7a2a2, #e3cfa2, #ebefa1, #b3e7a6, #a6ebe7, #aec5e3, #cabded, #e0b9e3, #f4bddd); background-size: 1800% 1800%; -webkit-animation: AnimationDark 44s cubic-bezier(0, 0.2, 0.90, 1) infinite; @@ -337,6 +340,7 @@ onBeforeUnmount(() => { &.gamingLight { -webkit-text-fill-color: unset !important; color: white; + border: solid 1px white; background: linear-gradient(270deg, #c06161, #c0a567, #b6ba69, #81bc72, #63c3be, #8bacd6, #9f8bd6, #d18bd6, #d883b4); background-size: 1800% 1800% !important; -webkit-animation: AnimationLight 45s cubic-bezier(0, 0.2, 0.90, 1) infinite !important; @@ -357,7 +361,7 @@ onBeforeUnmount(() => { margin-right: 6px; &.gamingDark { - color: white; + color: black; } diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index cd104f6dce..d9341c5872 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -8,30 +8,30 @@ SPDX-License-Identifier: AGPL-3.0-only