Skip to content

Commit 14e2314

Browse files
committed
fix(web): diff colors follow appearance contrast
1 parent fa31b66 commit 14e2314

1 file changed

Lines changed: 15 additions & 16 deletions

File tree

‎apps/web/src/lib/diffRendering.ts‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -291,37 +291,36 @@ export const DIFF_SURFACE_THEME_UNSAFE_CSS = `
291291
--diffs-bg-buffer-override: color-mix(in srgb, var(--code-background) 90%, var(--code-foreground));
292292
293293
--diffs-bg-addition-override: light-dark(
294-
color-mix(in srgb, var(--code-background) 50%, var(--diff-addition)),
295-
color-mix(in srgb, var(--code-background) 70%, var(--diff-addition))
294+
color-mix(in srgb, var(--code-background) calc(50% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition)),
295+
color-mix(in srgb, var(--code-background) calc(70% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition))
296296
);
297297
--diffs-bg-addition-number-override: light-dark(
298-
color-mix(in srgb, var(--code-background) 35%, var(--diff-addition)),
299-
color-mix(in srgb, var(--code-background) 60%, var(--diff-addition))
298+
color-mix(in srgb, var(--code-background) calc(35% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition)),
299+
color-mix(in srgb, var(--code-background) calc(60% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition))
300300
);
301301
--diffs-bg-addition-hover-override: color-mix(in srgb, var(--code-background) 85%, var(--diff-addition));
302-
--diffs-bg-addition-emphasis-override: color-mix(
303-
in srgb,
304-
var(--code-background) 80%,
305-
var(--diff-addition)
302+
/* Pierre resolves emphasis on the host, before the diff's overrides can inherit. */
303+
--diffs-bg-addition-emphasis: light-dark(
304+
rgb(from var(--diffs-addition-base) r g b / calc(15% + var(--appearance-contrast-boost, 0%) / 4)),
305+
rgb(from var(--diffs-addition-base) r g b / calc(20% + var(--appearance-contrast-boost, 0%) / 4))
306306
);
307307
308308
--diffs-bg-deletion-override: light-dark(
309-
color-mix(in srgb, var(--code-background) 50%, var(--diff-deletion)),
310-
color-mix(in srgb, var(--code-background) 70%, var(--diff-deletion))
309+
color-mix(in srgb, var(--code-background) calc(50% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion)),
310+
color-mix(in srgb, var(--code-background) calc(70% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion))
311311
);
312312
--diffs-bg-deletion-number-override: light-dark(
313-
color-mix(in srgb, var(--code-background) 35%, var(--diff-deletion)),
314-
color-mix(in srgb, var(--code-background) 60%, var(--diff-deletion))
313+
color-mix(in srgb, var(--code-background) calc(35% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion)),
314+
color-mix(in srgb, var(--code-background) calc(60% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion))
315315
);
316316
--diffs-bg-deletion-hover-override: color-mix(
317317
in srgb,
318318
var(--code-background) 85%,
319319
var(--diff-deletion)
320320
);
321-
--diffs-bg-deletion-emphasis-override: color-mix(
322-
in srgb,
323-
var(--code-background) 80%,
324-
var(--diff-deletion)
321+
--diffs-bg-deletion-emphasis: light-dark(
322+
rgb(from var(--diffs-deletion-base) r g b / calc(15% + var(--appearance-contrast-boost, 0%) / 4)),
323+
rgb(from var(--diffs-deletion-base) r g b / calc(20% + var(--appearance-contrast-boost, 0%) / 4))
325324
);
326325
327326
background-color: var(--diffs-bg) !important;

0 commit comments

Comments
 (0)