usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🎨

This commit is contained in:
syuilo 2025-03-12 13:04:41 +09:00
parent b03bcf26cd
commit caab1ec7c3
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/frontend/src/components/MkButton.vue
View File

@ -220,28 +220,28 @@ function onMousedown(evt: MouseEvent): void {
background: linear-gradient(90deg, var(--MI_THEME-buttonGradateA), var(--MI_THEME-buttonGradateB)); background: linear-gradient(90deg, var(--MI_THEME-buttonGradateA), var(--MI_THEME-buttonGradateB));
&:not(:disabled):hover { &:not(:disabled):hover {
background: linear-gradient(90deg, hsl(from var(--MI_THEME-accent) h s calc(l + 5)), hsl(from var(--MI_THEME-accent) h s calc(l + 5))); background: linear-gradient(90deg, hsl(from var(--MI_THEME-buttonGradateA) h s calc(l + 5)), hsl(from var(--MI_THEME-buttonGradateB) h s calc(l + 5)));
} }
&:not(:disabled):active { &:not(:disabled):active {
background: linear-gradient(90deg, hsl(from var(--MI_THEME-accent) h s calc(l + 5)), hsl(from var(--MI_THEME-accent) h s calc(l + 5))); background: linear-gradient(90deg, hsl(from var(--MI_THEME-buttonGradateA) h s calc(l + 5)), hsl(from var(--MI_THEME-buttonGradateB) h s calc(l + 5)));
} }
} }
&.danger { &.danger {
font-weight: bold; font-weight: bold;
color: #ff2a2a; color: var(--MI_THEME-error);
&.primary { &.primary {
color: #fff; color: #fff;
background: #ff2a2a; background: var(--MI_THEME-error);
&:not(:disabled):hover { &:not(:disabled):hover {
background: #ff4242; background: hsl(from var(--MI_THEME-error) h s calc(l + 10));
} }
&:not(:disabled):active { &:not(:disabled):active {
background: #d42e2e; background: hsl(from var(--MI_THEME-error) h s calc(l - 10));
} }
} }
} }

10
packages/frontend/src/components/MkMenu.vue
View File

@ -177,12 +177,12 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts"> <script lang="ts">
import { computed, defineAsyncComponent, inject, nextTick, onBeforeUnmount, onMounted, ref, shallowRef, unref, watch } from 'vue'; import { computed, defineAsyncComponent, inject, nextTick, onBeforeUnmount, onMounted, ref, shallowRef, unref, watch } from 'vue';
import MkSwitchButton from '@/components/MkSwitch.button.vue';
import type { MenuItem, InnerMenuItem, MenuPending, MenuAction, MenuSwitch, MenuRadio, MenuRadioOption, MenuParent } from '@/types/menu.js'; import type { MenuItem, InnerMenuItem, MenuPending, MenuAction, MenuSwitch, MenuRadio, MenuRadioOption, MenuParent } from '@/types/menu.js';
import type { Keymap } from '@/utility/hotkey.js';
import MkSwitchButton from '@/components/MkSwitch.button.vue';
import * as os from '@/os.js'; import * as os from '@/os.js';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { isTouchUsing } from '@/utility/touch.js'; import { isTouchUsing } from '@/utility/touch.js';
import type { Keymap } from '@/utility/hotkey.js';
import { isFocusable } from '@/utility/focus.js'; import { isFocusable } from '@/utility/focus.js';
import { getNodeOrNull } from '@/utility/get-dom-node-or-null.js'; import { getNodeOrNull } from '@/utility/get-dom-node-or-null.js';
@ -558,11 +558,11 @@ onBeforeUnmount(() => {
} }
&.danger { &.danger {
--menuFg: #ff2a2a; --menuFg: var(--MI_THEME-error);
--menuHoverFg: #fff; --menuHoverFg: #fff;
--menuHoverBg: #ff4242; --menuHoverBg: var(--MI_THEME-error);
--menuActiveFg: #fff; --menuActiveFg: #fff;
--menuActiveBg: #d42e2e; --menuActiveBg: hsl(from var(--MI_THEME-error) h s calc(l - 10));
} }
&.radio { &.radio {

1
packages/frontend/src/components/MkPreferenceContainer.vue
View File

@ -35,6 +35,7 @@ const isSyncEnabled = ref(prefer.isSyncEnabled(props.k));
function showMenu(ev: MouseEvent) { function showMenu(ev: MouseEvent) {
const i = window.setInterval(() => { const i = window.setInterval(() => {
isAccountOverrided.value = prefer.isAccountOverrided(props.k); isAccountOverrided.value = prefer.isAccountOverrided(props.k);
isSyncEnabled.value = prefer.isSyncEnabled(props.k);
}, 100); }, 100);
os.popupMenu(prefer.getPerPrefMenu(props.k), ev.currentTarget ?? ev.target, { os.popupMenu(prefer.getPerPrefMenu(props.k), ev.currentTarget ?? ev.target, {
onClosing: () => { onClosing: () => {