merge: upstream

This commit is contained in:
Marie 2024-02-06 21:23:37 +01:00
parent 34b4646b9f
commit 6a94a52131
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
60 changed files with 741 additions and 190 deletions

View file

@ -6,6 +6,7 @@
import { ref } from 'vue';
import tinycolor from 'tinycolor2';
import { deepClone } from './clone.js';
import type { BuiltinTheme } from 'shiki';
import { globalEvents } from '@/events.js';
import lightTheme from '@/themes/_light.json5';
import darkTheme from '@/themes/_dark.json5';
@ -18,6 +19,13 @@ export type Theme = {
desc?: string;
base?: 'dark' | 'light';
props: Record<string, string>;
codeHighlighter?: {
base: BuiltinTheme;
overrides?: Record<string, any>;
} | {
base: '_none_';
overrides: Record<string, any>;
};
};
export const themeProps = Object.keys(lightTheme.props).filter(key => !key.startsWith('X'));
@ -57,7 +65,7 @@ export const getBuiltinThemesRef = () => {
const themeFontFaceName = 'sharkey-theme-font-face';
let timeout = null;
let timeout: number | null = null;
export function applyTheme(theme: Theme, persist = true) {
if (timeout) window.clearTimeout(timeout);