Feat: マージして動くように

Author: mattyatea

packages/frontend/src/components/MkNote.vue

@@ -403,11 +403,11 @@ import {
 	inject,
 	onMounted,
 	provide,
-	Ref,
 	ref,
 	shallowRef,
 	watch,
-} from 'vue';import type { Ref } from 'vue';
+} from 'vue';
+import type { Ref } from 'vue';
 import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { isLink } from '@@/js/is-link.js';

packages/frontend/src/components/MkPostForm.vue

@@ -901,8 +901,8 @@ function isAnnoying(text: string): boolean {
 		text.includes('$[x4') ||
 		text.includes('$[scale') ||
 		text.includes('$[position') ||
-		text.value.includes('$[shake') ||
-		text.value.includes('$[twitch');
+		text.includes('$[shake') ||
+		text.includes('$[twitch');
 }
 
 async function post(ev?: MouseEvent) {

packages/frontend/src/pages/admin/index.vue

@@ -43,7 +43,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
 import { lookupUser, lookupUserByEmail, lookupFile } from '@/scripts/admin-lookup.js';
 import type { PageMetadata } from '@/scripts/page-metadata.js';
 import { useRouter } from '@/router/supplier.js';
-import { PageMetadata, definePageMetadata, provideMetadataReceiver, provideReactiveMetadata } from '@/scripts/page-metadata.js';
+import { definePageMetadata, provideMetadataReceiver, provideReactiveMetadata } from '@/scripts/page-metadata.js';
 import { bannerDark, bannerLight, defaultStore, iconDark, iconLight } from '@/store.js';
 
 const isEmpty = (x: string | null) => x == null || x === '';

packages/frontend/src/style.scss

@@ -255,11 +255,11 @@ rt {
 	background: var(--MI_THEME-accent);
 
 	&:not(:disabled):hover {
-		background: hsl(from var(--MI_THEME-accent) h s calc(l + 5%));
+		background: hsl(from var(--MI_THEME-accent) h s calc(l + 5));
 	}
 
 	&:not(:disabled):active {
-		background: hsl(from var(--MI_THEME-accent) h s calc(l - 5%));
+		background: hsl(from var(--MI_THEME-accent) h s calc(l - 5));
 	}
 }
 
@@ -269,14 +269,15 @@ rt {
 	background: linear-gradient(90deg, var(--MI_THEME-buttonGradateA), var(--MI_THEME-buttonGradateB));
 
 	&:not(:disabled):hover {
-		background: linear-gradient(90deg, hsl(from var(--MI_THEME-accent) h s 60%), hsl(from var(--MI_THEME-accent) h s 60%));
+		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)));
 	}
 
 	&:not(:disabled):active {
-		background: linear-gradient(90deg, hsl(from var(--MI_THEME-accent) h s 60%), hsl(from var(--MI_THEME-accent) h s 60%));
+		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)));
 	}
 }
 
+
 ._help {
 	color: var(--MI_THEME-accent);
 	cursor: help;

packages/frontend/src/ui/universal.vue

@@ -134,20 +134,15 @@ import { defaultStore } from '@/store.js';
 import { navbarItemDef } from '@/navbar.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/account.js';
-import { provideMetadataReceiver, provideReactiveMetadata } from '@/scripts/page-metadata.js';
 import type { PageMetadata } from '@/scripts/page-metadata.js';
-import { deviceKind } from '@/scripts/device-kind.js';
-import { miLocalStorage } from '@/local-storage.js';
-import { useScrollPositionManager } from '@/nirax.js';
-import { mainRouter } from '@/router/main.js';
-import { PageMetadata, provideMetadataReceiver, provideReactiveMetadata } from '@/scripts/page-metadata';
+import { provideMetadataReceiver, provideReactiveMetadata } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 import { miLocalStorage } from '@/local-storage';
 import { useScrollPositionManager } from '@/nirax';
+import { mainRouter } from '@/router/main.js';
 
 const darkMode = computed(defaultStore.makeGetterSetter('darkMode'));
 const gamingMode = computed(defaultStore.makeGetterSetter('gamingMode'));
-const indicatorCounterToggle = computed(defaultStore.makeGetterSetter('indicatorCounterToggle'));
 let gaming = ref();
 // gaming.valueに新しい値を代入する
 if (darkMode.value && gamingMode.value) {