Skip to content

Commit fbd77b9

Browse files
voltcrashmaria-rcksjuliusmarminge
authored
fix(web): diff colors follow appearance contrast (#28947)
Co-authored-by: maria-rcks <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 2f9d930 commit fbd77b9

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -293,37 +293,37 @@ export const DIFF_SURFACE_THEME_UNSAFE_CSS = `
293293
--diffs-bg-buffer-override: color-mix(in srgb, var(--code-background) 90%, var(--code-foreground));
294294
295295
--diffs-bg-addition-override: light-dark(
296-
color-mix(in srgb, var(--code-background) 50%, var(--diff-addition)),
297-
color-mix(in srgb, var(--code-background) 70%, var(--diff-addition))
296+
color-mix(in srgb, var(--code-background) calc(50% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition)),
297+
color-mix(in srgb, var(--code-background) calc(70% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition))
298298
);
299299
--diffs-bg-addition-number-override: light-dark(
300-
color-mix(in srgb, var(--code-background) 35%, var(--diff-addition)),
301-
color-mix(in srgb, var(--code-background) 60%, var(--diff-addition))
300+
color-mix(in srgb, var(--code-background) calc(35% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition)),
301+
color-mix(in srgb, var(--code-background) calc(60% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition))
302302
);
303303
--diffs-bg-addition-hover-override: color-mix(in srgb, var(--code-background) 85%, var(--diff-addition));
304-
--diffs-bg-addition-emphasis-override: color-mix(
305-
in srgb,
306-
var(--code-background) 80%,
307-
var(--diff-addition)
304+
/* Pierre resolves emphasis on the host, before the diff's overrides can inherit. */
305+
/* Light emphasis stays above t3-light's readable syntax luminance floor. */
306+
--diffs-bg-addition-emphasis: light-dark(
307+
rgb(from var(--diffs-addition-base) r g b / 15%),
308+
rgb(from var(--diffs-addition-base) r g b / calc(20% + var(--appearance-contrast-boost, 0%) / 4))
308309
);
309310
310311
--diffs-bg-deletion-override: light-dark(
311-
color-mix(in srgb, var(--code-background) 50%, var(--diff-deletion)),
312-
color-mix(in srgb, var(--code-background) 70%, var(--diff-deletion))
312+
color-mix(in srgb, var(--code-background) calc(50% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion)),
313+
color-mix(in srgb, var(--code-background) calc(70% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion))
313314
);
314315
--diffs-bg-deletion-number-override: light-dark(
315-
color-mix(in srgb, var(--code-background) 35%, var(--diff-deletion)),
316-
color-mix(in srgb, var(--code-background) 60%, var(--diff-deletion))
316+
color-mix(in srgb, var(--code-background) calc(35% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion)),
317+
color-mix(in srgb, var(--code-background) calc(60% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion))
317318
);
318319
--diffs-bg-deletion-hover-override: color-mix(
319320
in srgb,
320321
var(--code-background) 85%,
321322
var(--diff-deletion)
322323
);
323-
--diffs-bg-deletion-emphasis-override: color-mix(
324-
in srgb,
325-
var(--code-background) 80%,
326-
var(--diff-deletion)
324+
--diffs-bg-deletion-emphasis: light-dark(
325+
rgb(from var(--diffs-deletion-base) r g b / 15%),
326+
rgb(from var(--diffs-deletion-base) r g b / calc(20% + var(--appearance-contrast-boost, 0%) / 4))
327327
);
328328
329329
background-color: var(--diffs-bg) !important;

0 commit comments

Comments
 (0)