summaryrefslogtreecommitdiff
path: root/packages/frontend/src/scripts/theme.ts
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2024-03-24 11:53:52 +0000
committerdakkar <dakkar@thenautilus.net>2024-03-24 11:53:52 +0000
commitbc531ac414deab044d18ce41da1863138b2906a5 (patch)
tree500d323a47044216c4505695d4732d7dad3b08b2 /packages/frontend/src/scripts/theme.ts
parentMerge branch 'develop' into future-2024-03-23 (diff)
parenttest(backend): fix streaming test error when replying to followers-only note ... (diff)
downloadsharkey-bc531ac414deab044d18ce41da1863138b2906a5.tar.gz
sharkey-bc531ac414deab044d18ce41da1863138b2906a5.tar.bz2
sharkey-bc531ac414deab044d18ce41da1863138b2906a5.zip
Merge remote-tracking branch 'misskey/develop' into future-2024-03-23
Diffstat (limited to 'packages/frontend/src/scripts/theme.ts')
-rw-r--r--packages/frontend/src/scripts/theme.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/scripts/theme.ts b/packages/frontend/src/scripts/theme.ts
index c49593ed42..e59643b09c 100644
--- a/packages/frontend/src/scripts/theme.ts
+++ b/packages/frontend/src/scripts/theme.ts
@@ -6,7 +6,7 @@
import { ref } from 'vue';
import tinycolor from 'tinycolor2';
import { deepClone } from './clone.js';
-import type { BuiltinTheme } from 'shiki';
+import type { BundledTheme } from 'shiki/themes';
import { globalEvents } from '@/events.js';
import lightTheme from '@/themes/_light.json5';
import darkTheme from '@/themes/_dark.json5';
@@ -20,7 +20,7 @@ export type Theme = {
base?: 'dark' | 'light';
props: Record<string, string>;
codeHighlighter?: {
- base: BuiltinTheme;
+ base: BundledTheme;
overrides?: Record<string, any>;
} | {
base: '_none_';