Skip to content

Modern Docker Management, Designed for Everyone

fix: align editor themes with selected application theme (#4219)

Kyle Mendell7b1f28498d91
diff --git a/frontend/src/lib/components/code-editor/editor.svelte b/frontend/src/lib/components/code-editor/editor.svelte
index d1293a9c3..88d84e42c 100644
--- a/frontend/src/lib/components/code-editor/editor.svelte
+++ b/frontend/src/lib/components/code-editor/editor.svelte
@@ -26,7 +26,7 @@
import { m } from '#lib/paraglide/messages.js';
import userStore from '#lib/stores/user-store.svelte.js';
import { mode } from 'mode-watcher';
- import { arcaneDarkInit, arcaneLightInit } from './theme';
+ import { createArcaneTheme } from './theme';
import { createDefaultSummary, ENV_SNIPPETS, YAML_SNIPPETS } from './editor-constants';
import { createEnterIndentKeymap } from './enter-indentation';
import { createMergeHostAttachment, type MergeAttachmentParams } from './merge-editor.svelte.js';
@@ -713,11 +713,7 @@
return extensions;
}
- const theme = $derived.by(() => {
- // Re-derive when the user's theme/accent preferences change.
- userStore.current;
- return mode.current === 'dark' ? arcaneDarkInit() : arcaneLightInit();
- });
+ const theme = $derived(createArcaneTheme(mode.current === 'dark'));
const mergeHostAttachment = createMergeHostAttachment(
{
@@ -888,25 +884,11 @@
:global(.arcane-code-editor .cm-editor .cm-scroller) {
overflow-x: auto;
}
- :global(.dark .arcane-code-editor .cm-editor .cm-gutters) {
- background-color: #18181b;
+ :global(.arcane-code-editor .cm-editor .cm-gutters) {
border-right: none;
}
- :global(.dark .arcane-code-editor .cm-editor .cm-activeLineGutter) {
- background-color: #2c313a;
- color: #e5e7eb;
- }
- :global(:root:not(.dark) .arcane-code-editor .cm-editor .cm-gutters) {
- background-color: #ffffff;
- border-right: none;
- }
- :global(:root:not(.dark) .arcane-code-editor .cm-editor .cm-activeLineGutter) {
- background-color: #f0f1f3;
- color: #24292f;
- }
:global(.arcane-code-editor .cm-editor:has(.cm-placeholder) .cm-activeLine),
- :global(.dark .arcane-code-editor .cm-editor:has(.cm-placeholder) .cm-activeLineGutter),
- :global(:root:not(.dark) .arcane-code-editor .cm-editor:has(.cm-placeholder) .cm-activeLineGutter) {
+ :global(.arcane-code-editor .cm-editor:has(.cm-placeholder) .cm-activeLineGutter) {
background-color: transparent;
}
:global(.arcane-code-editor .cm-mergeView) {
@@ -934,14 +916,14 @@
text-align: center;
}
.merge-pane-label-new {
- color: #3fb950;
- background: color-mix(in oklab, #3fb950 18%, transparent);
- border: 1px solid color-mix(in oklab, #3fb950 45%, transparent);
+ color: var(--success);
+ background: color-mix(in oklab, var(--success) 18%, transparent);
+ border: 1px solid color-mix(in oklab, var(--success) 45%, transparent);
}
.merge-pane-label-old {
- color: #f85149;
- background: color-mix(in oklab, #f85149 18%, transparent);
- border: 1px solid color-mix(in oklab, #f85149 45%, transparent);
+ color: var(--destructive);
+ background: color-mix(in oklab, var(--destructive) 18%, transparent);
+ border: 1px solid color-mix(in oklab, var(--destructive) 45%, transparent);
}
.merge-legend {
display: flex;
@@ -958,14 +940,14 @@
border-radius: 999px;
}
.merge-badge-add {
- color: #3fb950;
- background: color-mix(in oklab, #3fb950 16%, transparent);
- border: 1px solid color-mix(in oklab, #3fb950 40%, transparent);
+ color: var(--success);
+ background: color-mix(in oklab, var(--success) 16%, transparent);
+ border: 1px solid color-mix(in oklab, var(--success) 40%, transparent);
}
.merge-badge-del {
- color: #f85149;
- background: color-mix(in oklab, #f85149 16%, transparent);
- border: 1px solid color-mix(in oklab, #f85149 40%, transparent);
+ color: var(--destructive);
+ background: color-mix(in oklab, var(--destructive) 16%, transparent);
+ border: 1px solid color-mix(in oklab, var(--destructive) 40%, transparent);
}
.merge-host {
flex: 1;
@@ -1000,29 +982,35 @@
}
:global(.arcane-code-editor .merge-host .cm-merge-a .cm-changedLine),
:global(.arcane-code-editor .merge-host .cm-merge-a .cm-inlineChangedLine) {
- background-color: rgba(46, 160, 67, 0.14) !important;
+ background-color: color-mix(in oklab, var(--success) 14%, transparent) !important;
}
:global(.arcane-code-editor .merge-host .cm-merge-b .cm-changedLine),
:global(.arcane-code-editor .merge-host .cm-merge-b .cm-inlineChangedLine),
:global(.arcane-code-editor .merge-host .cm-deletedChunk) {
- background-color: rgba(248, 81, 73, 0.14) !important;
+ background-color: color-mix(in oklab, var(--destructive) 14%, transparent) !important;
}
:global(.arcane-code-editor .merge-host .cm-merge-a .cm-changedText) {
- background: linear-gradient(rgba(46, 160, 67, 0.7), rgba(46, 160, 67, 0.7)) bottom/100% 2px no-repeat !important;
+ background: linear-gradient(
+ color-mix(in oklab, var(--success) 70%, transparent),
+ color-mix(in oklab, var(--success) 70%, transparent)
+ )
+ bottom/100% 2px no-repeat !important;
}
:global(.arcane-code-editor .merge-host .cm-merge-b .cm-changedText),
:global(.arcane-code-editor .merge-host .cm-merge-b .cm-deletedText),
:global(.arcane-code-editor .merge-host .cm-deletedChunk .cm-deletedText) {
- background: linear-gradient(rgba(248, 81, 73, 0.75), rgba(248, 81, 73, 0.75)) bottom/100% 2px no-repeat !important;
+ background: linear-gradient(
+ color-mix(in oklab, var(--destructive) 75%, transparent),
+ color-mix(in oklab, var(--destructive) 75%, transparent)
+ )
+ bottom/100% 2px no-repeat !important;
}
:global(.arcane-code-editor .merge-host .cm-merge-a .cm-changedLineGutter) {
- background-color: #2ea043 !important;
- color: #fff !important;
+ background-color: var(--success) !important;
}
:global(.arcane-code-editor .merge-host .cm-merge-b .cm-changedLineGutter),
:global(.arcane-code-editor .merge-host .cm-merge-b .cm-deletedLineGutter) {
- background-color: #f85149 !important;
- color: #fff !important;
+ background-color: var(--destructive) !important;
}
.editor-status {
display: flex;
diff --git a/frontend/src/lib/components/code-editor/merge-editor.svelte.ts b/frontend/src/lib/components/code-editor/merge-editor.svelte.ts
index af30a6108..160432644 100644
--- a/frontend/src/lib/components/code-editor/merge-editor.svelte.ts
+++ b/frontend/src/lib/components/code-editor/merge-editor.svelte.ts
@@ -1,4 +1,4 @@
-import { EditorState, type Extension } from '@codemirror/state';
+import { Compartment, EditorState, type Extension } from '@codemirror/state';
import { MergeView } from '@codemirror/merge';
import { EditorView } from '@codemirror/view';
import { untrack } from 'svelte';
@@ -29,6 +29,8 @@ export function createMergeHostAttachment(
return (node) => {
let currentParams = untrack(getParams);
let currentMergeView: MergeView | null = null;
+ const themeCompartmentA = new Compartment();
+ const themeCompartmentB = new Compartment();
const destroyCurrentMergeView = () => {
if (!currentMergeView) return;
@@ -39,8 +41,8 @@ export function createMergeHostAttachment(
const createCurrentMergeView = () => {
if (!currentParams.diffActive || currentMergeView) return;
- const theme = getTheme();
- const readonlyExtension = [EditorState.readOnly.of(true), EditorView.editable.of(false), theme];
+ const theme = untrack(getTheme);
+ const readonlyExtension = [EditorState.readOnly.of(true), EditorView.editable.of(false), themeCompartmentB.of(theme)];
currentMergeView = new MergeView({
parent: node,
@@ -48,7 +50,7 @@ export function createMergeHostAttachment(
doc: currentParams.value,
extensions: [
...getLanguageExtension(currentParams.language, { lightweight: true }),
- theme,
+ themeCompartmentA.of(theme),
EditorView.updateListener.of((update) => {
if (update.docChanged) {
onValueChange(update.state.doc.toString());
@@ -115,6 +117,15 @@ export function createMergeHostAttachment(
untrack(() => applyParams(nextParams));
});
+ $effect(() => {
+ const theme = getTheme();
+ untrack(() => {
+ if (!currentMergeView) return;
+ currentMergeView.a.dispatch({ effects: themeCompartmentA.reconfigure(theme) });
+ currentMergeView.b.dispatch({ effects: themeCompartmentB.reconfigure(theme) });
+ });
+ });
+
return destroyCurrentMergeView;
};
}
diff --git a/frontend/src/lib/components/code-editor/theme.ts b/frontend/src/lib/components/code-editor/theme.ts
index ca2935179..5234800ea 100644
--- a/frontend/src/lib/components/code-editor/theme.ts
+++ b/frontend/src/lib/components/code-editor/theme.ts
@@ -1,121 +1,108 @@
import { tags as t } from '@lezer/highlight';
-import { createTheme, type CreateThemeOptions } from '@uiw/codemirror-themes';
+import { EditorView } from '@codemirror/view';
+import type { Extension } from '@codemirror/state';
+import { createTheme } from '@uiw/codemirror-themes';
-function getAccentColor(): string {
- const primaryColor = getComputedStyle(document.documentElement).getPropertyValue('--primary').trim();
-
- return primaryColor || 'oklch(0.606 0.25 292.717)';
-}
-
-function getAccentColorWithAlpha(alpha: number): string {
- // color-mix handles any color notation the CSS pipeline may emit for
- // --primary (oklch, lab, rgb, hex, ...) — format-sniffing here previously
- // returned unknown formats unchanged, i.e. fully opaque.
- return `color-mix(in oklab, ${getAccentColor()} ${Math.round(alpha * 100)}%, transparent)`;
-}
-
-interface ArcaneThemePalette {
- theme: 'dark' | 'light';
- background: string;
- foreground: string;
- gutterForeground: string;
- comment: string;
- keyword: string;
- typeName: string;
- className: string;
- variableName: string;
- string: string;
- operator: string;
- separator: string;
- invalid: string;
+function accentWithAlpha(alpha: number): string {
+ return `color-mix(in oklab, var(--primary) ${Math.round(alpha * 100)}%, transparent)`;
}
-function createArcaneThemeInit(palette: ArcaneThemePalette) {
- return (options?: Partial<CreateThemeOptions>) => {
- const { theme = palette.theme, settings = {}, styles = [] } = options || {};
-
- const accentColor = getAccentColor();
- const accentWithAlpha35 = getAccentColorWithAlpha(0.35);
- const accentWithAlpha15 = getAccentColorWithAlpha(0.15);
- const accentWithAlpha05 = getAccentColorWithAlpha(0.05);
-
- const dynamicSettings: CreateThemeOptions['settings'] = {
- background: palette.background,
- foreground: palette.foreground,
- caret: accentColor,
- selection: accentWithAlpha35,
- selectionMatch: accentWithAlpha15,
- lineHighlight: accentWithAlpha05,
- gutterBackground: palette.background,
- gutterForeground: palette.gutterForeground,
- gutterActiveForeground: palette.foreground,
- gutterBorder: 'transparent',
-
- fontFamily: '"Mona Sans Mono", ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace',
- fontSize: '13px'
- };
-
- const dynamicStyles: CreateThemeOptions['styles'] = [
- { tag: [t.comment, t.meta], color: palette.comment },
- { tag: [t.keyword, t.modifier, t.operatorKeyword], color: palette.keyword },
+// Panels, tooltips, completions and search UI are not covered by createTheme.
+const chromeTheme = EditorView.theme({
+ '.cm-panels': {
+ backgroundColor: 'var(--popover)',
+ color: 'var(--popover-foreground)'
+ },
+ '.cm-panels-top': { borderBottom: '1px solid var(--border)' },
+ '.cm-panels-bottom': { borderTop: '1px solid var(--border)' },
+ '.cm-textfield': {
+ backgroundColor: 'var(--background)',
+ color: 'var(--foreground)',
+ border: '1px solid var(--input)',
+ borderRadius: '0.25rem'
+ },
+ '.cm-button': {
+ backgroundImage: 'none',
+ backgroundColor: 'var(--secondary)',
+ color: 'var(--secondary-foreground)',
+ border: '1px solid var(--border)',
+ borderRadius: '0.25rem',
+ '&:active': { backgroundImage: 'none', backgroundColor: 'var(--accent)' }
+ },
+ '.cm-tooltip': {
+ backgroundColor: 'var(--popover)',
+ color: 'var(--popover-foreground)',
+ border: '1px solid var(--border)',
+ borderRadius: '0.375rem'
+ },
+ '.cm-tooltip-section:not(:first-child)': { borderTop: '1px solid var(--border)' },
+ '.cm-tooltip-autocomplete ul li[aria-selected]': {
+ backgroundColor: accentWithAlpha(0.2),
+ color: 'var(--popover-foreground)'
+ },
+ '.cm-completionMatchedText': { color: 'var(--primary)', textDecoration: 'none', fontWeight: '600' },
+ '.cm-searchMatch': {
+ backgroundColor: accentWithAlpha(0.25),
+ '& span': { outline: `1px solid ${accentWithAlpha(0.6)}` }
+ },
+ '.cm-searchMatch.cm-searchMatch-selected': { backgroundColor: accentWithAlpha(0.45) },
+ '.cm-collapsedLines': {
+ color: 'var(--muted-foreground)',
+ background: 'linear-gradient(to bottom, transparent 0, var(--muted) 30%, var(--muted) 70%, transparent 100%)'
+ },
+ '.cm-foldPlaceholder': {
+ backgroundColor: 'var(--muted)',
+ color: 'var(--muted-foreground)',
+ border: '1px solid var(--border)'
+ }
+});
- { tag: [t.typeName, t.namespace, t.number, t.atom, t.bool], color: palette.typeName },
- { tag: [t.function(t.variableName), t.labelName], color: accentColor },
- {
- tag: [t.className, t.definition(t.variableName), t.propertyName, t.attributeName],
- color: palette.className
+export function createArcaneTheme(dark: boolean): Extension {
+ return [
+ createTheme({
+ theme: dark ? 'dark' : 'light',
+ settings: {
+ background: 'var(--background)',
+ foreground: 'var(--foreground)',
+ caret: 'var(--primary)',
+ selection: accentWithAlpha(0.35),
+ selectionMatch: accentWithAlpha(0.15),
+ lineHighlight: accentWithAlpha(0.05),
+ gutterBackground: 'var(--background)',
+ gutterForeground: 'var(--muted-foreground)',
+ gutterActiveForeground: 'var(--foreground)',
+ gutterBorder: 'transparent',
+ fontFamily:
+ '"Mona Sans Mono", ui-monospace, SFMono-Regular, Menlo, Consolas, "Liberation Mono", "Courier New", monospace',
+ fontSize: '13px'
},
-
- { tag: [t.variableName, t.name], color: palette.variableName },
- { tag: [t.string, t.inserted, t.regexp, t.special(t.string)], color: palette.string },
- { tag: [t.operator, t.url, t.link, t.escape], color: palette.operator },
-
- { tag: [t.separator, t.punctuation], color: palette.separator },
-
- { tag: t.heading, color: palette.variableName, fontWeight: 'bold' },
- { tag: t.strong, fontWeight: 'bold' },
- { tag: t.emphasis, fontStyle: 'italic' },
- { tag: t.strikethrough, textDecoration: 'line-through' },
- { tag: t.invalid, color: palette.invalid },
- { tag: t.link, textDecoration: 'underline' }
- ];
-
- return createTheme({
- theme,
- settings: { ...dynamicSettings, ...settings },
- styles: [...dynamicStyles, ...styles]
- });
- };
+ styles: [
+ { tag: [t.comment, t.meta], color: 'var(--syntax-comment)' },
+ { tag: [t.keyword, t.modifier, t.operatorKeyword], color: 'var(--syntax-keyword)' },
+ { tag: [t.typeName, t.namespace, t.number, t.atom, t.bool], color: 'var(--syntax-number)' },
+ {
+ tag: [
+ t.className,
+ t.definition(t.variableName),
+ t.propertyName,
+ t.attributeName,
+ t.function(t.variableName),
+ t.labelName
+ ],
+ color: 'var(--syntax-property)'
+ },
+ { tag: [t.variableName, t.name], color: 'var(--foreground)' },
+ { tag: [t.string, t.inserted, t.regexp, t.special(t.string)], color: 'var(--syntax-string)' },
+ { tag: [t.operator, t.url, t.link, t.escape], color: 'var(--syntax-operator)' },
+ { tag: [t.separator, t.punctuation], color: 'var(--muted-foreground)' },
+ { tag: t.heading, color: 'var(--foreground)', fontWeight: 'bold' },
+ { tag: t.strong, fontWeight: 'bold' },
+ { tag: t.emphasis, fontStyle: 'italic' },
+ { tag: t.strikethrough, textDecoration: 'line-through' },
+ { tag: t.invalid, color: 'var(--destructive)' },
+ { tag: t.link, textDecoration: 'underline' }
+ ]
+ }),
+ chromeTheme
+ ];
}
-
-export const arcaneDarkInit = createArcaneThemeInit({
- theme: 'dark',
- background: '#0d1117',
- foreground: '#c9d1d9',
- gutterForeground: '#8b949e',
- comment: '#8b949e',
- keyword: '#ff7b72',
- typeName: '#ffa657',
- className: '#d2a8ff',
- variableName: '#e6edf3',
- string: '#7ee787',
- operator: '#a5d6ff',
- separator: '#6e7681',
- invalid: '#f85149'
-});
-
-export const arcaneLightInit = createArcaneThemeInit({
- theme: 'light',
- background: '#ffffff',
- foreground: '#24292f',
- gutterForeground: '#8c959f',
- comment: '#6e7781',
- keyword: '#cf222e',
- typeName: '#953800',
- className: '#8250df',
- variableName: '#24292f',
- string: '#0a3069',
- operator: '#0550ae',
- separator: '#6e7781',
- invalid: '#cf222e'
-});
diff --git a/frontend/src/routes/layout.css b/frontend/src/routes/layout.css
index 7f564be69..d2464a581 100644
--- a/frontend/src/routes/layout.css
+++ b/frontend/src/routes/layout.css
@@ -30,6 +30,12 @@
--success: oklch(0.596 0.145 163.225);
--warning: oklch(0.666 0.179 58.318);
--info: oklch(0.546 0.245 262.881);
+ --syntax-comment: #6e7781;
+ --syntax-keyword: #cf222e;
+ --syntax-property: #8250df;
+ --syntax-string: #0a3069;
+ --syntax-number: #953800;
+ --syntax-operator: #0550ae;
--orange: oklch(0.646 0.222 41.116);
--lime: oklch(0.648 0.2 131.684);
--teal: oklch(0.6 0.118 184.704);
@@ -107,6 +113,12 @@
--success: oklch(0.765 0.177 163.223);
--warning: oklch(0.828 0.189 84.429);
--info: oklch(0.707 0.165 254.624);
+ --syntax-comment: #8b949e;
+ --syntax-keyword: #ff7b72;
+ --syntax-property: #d2a8ff;
+ --syntax-string: #7ee787;
+ --syntax-number: #ffa657;
+ --syntax-operator: #a5d6ff;
--orange: oklch(0.75 0.183 55.934);
--lime: oklch(0.841 0.238 128.85);
--teal: oklch(0.777 0.152 181.912);
diff --git a/frontend/src/routes/themes.css b/frontend/src/routes/themes.css
index db56b7cdf..33f1e8b76 100644
--- a/frontend/src/routes/themes.css
+++ b/frontend/src/routes/themes.css
@@ -29,6 +29,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0.11 0.012 264.4 / 0.12);
+ --syntax-comment: oklch(0.55 0.02 260);
+ --syntax-keyword: oklch(0.5 0.09 300);
+ --syntax-property: oklch(0.5 0.13 258);
+ --syntax-string: oklch(0.5 0.08 190);
+ --syntax-number: oklch(0.55 0.1 70);
+ --syntax-operator: oklch(0.5 0.06 258);
}
:root.dark[data-app-theme='graphite'] {
@@ -62,6 +68,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0 0 0 / 0.38);
+ --syntax-comment: oklch(0.62 0.02 260);
+ --syntax-keyword: oklch(0.8 0.08 300);
+ --syntax-property: oklch(0.8 0.1 255);
+ --syntax-string: oklch(0.82 0.07 190);
+ --syntax-number: oklch(0.84 0.09 75);
+ --syntax-operator: oklch(0.78 0.05 255);
}
:root[data-app-theme='carbon'] {
@@ -95,6 +107,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0.227 0.004 286.1 / 0.12);
+ --syntax-comment: oklch(0.55 0 0);
+ --syntax-keyword: oklch(0.5 0.2 350);
+ --syntax-property: oklch(0.5 0.17 262);
+ --syntax-string: oklch(0.5 0.13 150);
+ --syntax-number: oklch(0.5 0.2 300);
+ --syntax-operator: oklch(0.5 0.1 220);
}
:root.dark[data-app-theme='carbon'] {
@@ -128,6 +146,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0 0 0 / 0.4);
+ --syntax-comment: oklch(0.66 0 0);
+ --syntax-keyword: oklch(0.78 0.14 345);
+ --syntax-property: oklch(0.76 0.12 262);
+ --syntax-string: oklch(0.8 0.15 150);
+ --syntax-number: oklch(0.78 0.13 300);
+ --syntax-operator: oklch(0.8 0.1 220);
}
:root[data-app-theme='ocean'] {
@@ -161,6 +185,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0.288 0.052 265.1 / 0.12);
+ --syntax-comment: oklch(0.55 0.03 265);
+ --syntax-keyword: oklch(0.55 0.17 30);
+ --syntax-property: oklch(0.5 0.16 266);
+ --syntax-string: oklch(0.5 0.1 190);
+ --syntax-number: oklch(0.58 0.12 70);
+ --syntax-operator: oklch(0.5 0.12 230);
}
:root.dark[data-app-theme='ocean'] {
@@ -194,6 +224,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0 0 0 / 0.38);
+ --syntax-comment: oklch(0.65 0.03 265);
+ --syntax-keyword: oklch(0.8 0.12 30);
+ --syntax-property: oklch(0.8 0.12 264);
+ --syntax-string: oklch(0.82 0.1 185);
+ --syntax-number: oklch(0.86 0.1 80);
+ --syntax-operator: oklch(0.8 0.1 230);
}
:root[data-app-theme='amber'] {
@@ -227,6 +263,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0.16 0.024 63.6 / 0.12);
+ --syntax-comment: oklch(0.55 0.02 70);
+ --syntax-keyword: oklch(0.5 0.17 30);
+ --syntax-property: oklch(0.55 0.15 65);
+ --syntax-string: oklch(0.5 0.12 120);
+ --syntax-number: oklch(0.55 0.15 45);
+ --syntax-operator: oklch(0.5 0.08 180);
}
:root.dark[data-app-theme='amber'] {
@@ -260,6 +302,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0 0 0 / 0.34);
+ --syntax-comment: oklch(0.66 0.02 70);
+ --syntax-keyword: oklch(0.78 0.13 30);
+ --syntax-property: oklch(0.84 0.13 75);
+ --syntax-string: oklch(0.82 0.13 120);
+ --syntax-number: oklch(0.86 0.12 55);
+ --syntax-operator: oklch(0.8 0.08 180);
}
:root[data-app-theme='github'] {
@@ -293,6 +341,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0.12 0.008 248.2 / 0.1);
+ --syntax-comment: #6e7781;
+ --syntax-keyword: #cf222e;
+ --syntax-property: #8250df;
+ --syntax-string: #0a3069;
+ --syntax-number: #953800;
+ --syntax-operator: #0550ae;
}
:root.dark[data-app-theme='github'] {
@@ -326,6 +380,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0 0 0 / 0.34);
+ --syntax-comment: #8b949e;
+ --syntax-keyword: #ff7b72;
+ --syntax-property: #d2a8ff;
+ --syntax-string: #7ee787;
+ --syntax-number: #ffa657;
+ --syntax-operator: #a5d6ff;
}
:root[data-app-theme='nord'] {
@@ -359,6 +419,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0.16 0.02 258.6 / 0.1);
+ --syntax-comment: oklch(0.55 0.03 260);
+ --syntax-keyword: oklch(0.55 0.08 260);
+ --syntax-property: oklch(0.52 0.09 235);
+ --syntax-string: oklch(0.55 0.1 130);
+ --syntax-number: oklch(0.6 0.12 45);
+ --syntax-operator: oklch(0.55 0.07 330);
}
:root.dark[data-app-theme='nord'] {
@@ -392,6 +458,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0 0 0 / 0.33);
+ --syntax-comment: oklch(0.62 0.03 265);
+ --syntax-keyword: oklch(0.72 0.08 255);
+ --syntax-property: oklch(0.8 0.08 220);
+ --syntax-string: oklch(0.78 0.08 130);
+ --syntax-number: oklch(0.73 0.1 40);
+ --syntax-operator: oklch(0.75 0.07 330);
}
:root[data-app-theme='everforest'] {
@@ -425,6 +497,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0.18 0.022 156.1 / 0.1);
+ --syntax-comment: oklch(0.58 0.03 130);
+ --syntax-keyword: oklch(0.58 0.16 25);
+ --syntax-property: oklch(0.52 0.12 140);
+ --syntax-string: oklch(0.58 0.12 80);
+ --syntax-number: oklch(0.58 0.13 330);
+ --syntax-operator: oklch(0.52 0.08 180);
}
:root.dark[data-app-theme='everforest'] {
@@ -458,6 +536,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0 0 0 / 0.34);
+ --syntax-comment: oklch(0.64 0.02 140);
+ --syntax-keyword: oklch(0.76 0.1 20);
+ --syntax-property: oklch(0.8 0.09 128);
+ --syntax-string: oklch(0.84 0.1 85);
+ --syntax-number: oklch(0.78 0.08 340);
+ --syntax-operator: oklch(0.78 0.07 180);
}
:root[data-app-theme='rosepine'] {
@@ -491,6 +575,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0.19 0.024 313.7 / 0.1);
+ --syntax-comment: oklch(0.62 0.03 300);
+ --syntax-keyword: oklch(0.55 0.14 355);
+ --syntax-property: oklch(0.58 0.12 350);
+ --syntax-string: oklch(0.66 0.14 70);
+ --syntax-number: oklch(0.55 0.1 300);
+ --syntax-operator: oklch(0.5 0.08 220);
}
:root.dark[data-app-theme='rosepine'] {
@@ -524,6 +614,12 @@
--glass-base: var(--surface);
--glass-tint: var(--primary);
--glass-shadow-color: oklch(0 0 0 / 0.34);
+ --syntax-comment: oklch(0.6 0.03 300);
+ --syntax-keyword: oklch(0.72 0.16 355);
+ --syntax-property: oklch(0.82 0.07 20);
+ --syntax-string: oklch(0.85 0.1 80);
+ --syntax-number: oklch(0.8 0.08 300);
+ --syntax-operator: oklch(0.82 0.07 200);
}
.dark.oled:not([data-app-theme]) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 117b015a9..d4c5fe0d4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2665,11 +2665,6 @@ packages:
resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
- peerDependencies:
- ajv: '>=8.18.0'
- peerDependenciesMeta:
- ajv:
- optional: true
resolution: {integrity: sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==}
@@ -4506,7 +4501,7 @@ snapshots:
'@babel/code-frame': 7.29.7
'@babel/generator': 7.29.8
'@babel/helper-globals': 7.29.7
- '@babel/parser': 7.29.9
+ '@babel/parser': 7.29.2
'@babel/template': 7.29.7
'@babel/types': 7.29.8
debug: 4.4.3
@@ -6225,8 +6220,8 @@ snapshots:
- optionalDependencies:
+ dependencies:
ajv: 8.20.0
@@ -6365,7 +6360,7 @@ snapshots:
dependencies:
ajv: 8.20.0
- ajv-formats: 3.0.1([email protected])
+ ajv-formats: 3.0.1
atomically: 2.1.1
debounce-fn: 6.0.0
dot-prop: 10.2.0