Fix diff line number contrast for built-in themes (#22464)

This commit is contained in:
Sebastian 2026-04-14 19:59:41 +02:00 committed by GitHub
parent 4626458175
commit a53fae1511
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
34 changed files with 61 additions and 71 deletions

View File

@ -116,8 +116,8 @@
"light": "nord5" "light": "nord5"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "nord2", "dark": "#abafb7",
"light": "nord4" "light": "textMuted"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#3B4252", "dark": "#3B4252",

View File

@ -542,8 +542,10 @@ function generateSystem(colors: TerminalColors, mode: "dark" | "light"): ThemeJs
const diffAlpha = isDark ? 0.22 : 0.14 const diffAlpha = isDark ? 0.22 : 0.14
const diffAddedBg = tint(bg, ansiColors.green, diffAlpha) const diffAddedBg = tint(bg, ansiColors.green, diffAlpha)
const diffRemovedBg = tint(bg, ansiColors.red, diffAlpha) const diffRemovedBg = tint(bg, ansiColors.red, diffAlpha)
const diffAddedLineNumberBg = tint(grays[3], ansiColors.green, diffAlpha) const diffContextBg = grays[2]
const diffRemovedLineNumberBg = tint(grays[3], ansiColors.red, diffAlpha) const diffAddedLineNumberBg = tint(diffContextBg, ansiColors.green, diffAlpha)
const diffRemovedLineNumberBg = tint(diffContextBg, ansiColors.red, diffAlpha)
const diffLineNumber = textMuted
return { return {
theme: { theme: {
@ -583,8 +585,8 @@ function generateSystem(colors: TerminalColors, mode: "dark" | "light"): ThemeJs
diffHighlightRemoved: ansiColors.redBright, diffHighlightRemoved: ansiColors.redBright,
diffAddedBg, diffAddedBg,
diffRemovedBg, diffRemovedBg,
diffContextBg: grays[1], diffContextBg,
diffLineNumber: grays[6], diffLineNumber,
diffAddedLineNumberBg, diffAddedLineNumberBg,
diffRemovedLineNumberBg, diffRemovedLineNumberBg,

View File

@ -39,7 +39,7 @@
"diffAddedBg": "#354933", "diffAddedBg": "#354933",
"diffRemovedBg": "#3f191a", "diffRemovedBg": "#3f191a",
"diffContextBg": "darkBgPanel", "diffContextBg": "darkBgPanel",
"diffLineNumber": "darkBorder", "diffLineNumber": "#898989",
"diffAddedLineNumberBg": "#162620", "diffAddedLineNumberBg": "#162620",
"diffRemovedLineNumberBg": "#26161a", "diffRemovedLineNumberBg": "#26161a",
"markdownText": "darkFg", "markdownText": "darkFg",

View File

@ -50,7 +50,7 @@
"diffAddedBg": "#20303b", "diffAddedBg": "#20303b",
"diffRemovedBg": "#37222c", "diffRemovedBg": "#37222c",
"diffContextBg": "darkPanel", "diffContextBg": "darkPanel",
"diffLineNumber": "darkGutter", "diffLineNumber": "diffContext",
"diffAddedLineNumberBg": "#1b2b34", "diffAddedLineNumberBg": "#1b2b34",
"diffRemovedLineNumberBg": "#2d1f26", "diffRemovedLineNumberBg": "#2d1f26",
"markdownText": "darkFg", "markdownText": "darkFg",

View File

@ -141,8 +141,8 @@
"light": "lbg1" "light": "lbg1"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "fg3", "dark": "#808792",
"light": "lfg3" "light": "textMuted"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "diffGreenBg", "dark": "diffGreenBg",

View File

@ -125,10 +125,7 @@
"dark": "frappeMantle", "dark": "frappeMantle",
"light": "frappeMantle" "light": "frappeMantle"
}, },
"diffLineNumber": { "diffLineNumber": "textMuted",
"dark": "frappeSurface1",
"light": "frappeSurface1"
},
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#223025", "dark": "#223025",
"light": "#223025" "light": "#223025"

View File

@ -125,10 +125,7 @@
"dark": "macMantle", "dark": "macMantle",
"light": "macMantle" "light": "macMantle"
}, },
"diffLineNumber": { "diffLineNumber": "textMuted",
"dark": "macSurface1",
"light": "macSurface1"
},
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#223025", "dark": "#223025",
"light": "#223025" "light": "#223025"

View File

@ -79,7 +79,7 @@
"diffAddedBg": { "dark": "#24312b", "light": "#d6f0d9" }, "diffAddedBg": { "dark": "#24312b", "light": "#d6f0d9" },
"diffRemovedBg": { "dark": "#3c2a32", "light": "#f6dfe2" }, "diffRemovedBg": { "dark": "#3c2a32", "light": "#f6dfe2" },
"diffContextBg": { "dark": "darkMantle", "light": "lightMantle" }, "diffContextBg": { "dark": "darkMantle", "light": "lightMantle" },
"diffLineNumber": { "dark": "darkSurface1", "light": "lightSurface1" }, "diffLineNumber": { "dark": "textMuted", "light": "#5b5d63" },
"diffAddedLineNumberBg": { "dark": "#1e2a25", "light": "#c9e3cb" }, "diffAddedLineNumberBg": { "dark": "#1e2a25", "light": "#c9e3cb" },
"diffRemovedLineNumberBg": { "dark": "#32232a", "light": "#e9d3d6" }, "diffRemovedLineNumberBg": { "dark": "#32232a", "light": "#e9d3d6" },
"markdownText": { "dark": "darkText", "light": "lightText" }, "markdownText": { "dark": "darkText", "light": "lightText" },

View File

@ -120,10 +120,7 @@
"dark": "#122738", "dark": "#122738",
"light": "#f5f7fa" "light": "#f5f7fa"
}, },
"diffLineNumber": { "diffLineNumber": "textMuted",
"dark": "#2d5a7b",
"light": "#b0bec5"
},
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#1a3a2a", "dark": "#1a3a2a",
"light": "#e8f5e9" "light": "#e8f5e9"

View File

@ -142,8 +142,8 @@
"light": "lightPanel" "light": "lightPanel"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "#e4e4e442", "dark": "#eeeeee87",
"light": "#1414147a" "light": "textMuted"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#3fa26633", "dark": "#3fa26633",

View File

@ -112,8 +112,8 @@
"light": "#e8e8e2" "light": "#e8e8e2"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "currentLine", "dark": "#989aa4",
"light": "#c8c8c2" "light": "#686865"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#1a3a1a", "dark": "#1a3a1a",

View File

@ -134,8 +134,8 @@
"light": "lightStep2" "light": "lightStep2"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "darkStep3", "dark": "#a0a5a7",
"light": "lightStep3" "light": "#5b5951"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#1b2b34", "dark": "#1b2b34",

View File

@ -130,8 +130,8 @@
"light": "base50" "light": "base50"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "base600", "dark": "#888883",
"light": "base600" "light": "#5a5955"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#152515", "dark": "#152515",

View File

@ -126,8 +126,8 @@
"light": "lightBgAlt" "light": "lightBgAlt"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "#484f58", "dark": "#95999e",
"light": "#afb8c1" "light": "textMuted"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#033a16", "dark": "#033a16",

View File

@ -135,8 +135,8 @@
"light": "lightBg1" "light": "lightBg1"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "darkBg3", "dark": "#a8a29e",
"light": "lightBg3" "light": "#564f43"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#2a2827", "dark": "#2a2827",

View File

@ -47,7 +47,7 @@
"diffAddedBg": { "dark": "#252E25", "light": "#EAF3E4" }, "diffAddedBg": { "dark": "#252E25", "light": "#EAF3E4" },
"diffRemovedBg": { "dark": "#362020", "light": "#FBE6E6" }, "diffRemovedBg": { "dark": "#362020", "light": "#FBE6E6" },
"diffContextBg": { "dark": "sumiInk1", "light": "lightPaper" }, "diffContextBg": { "dark": "sumiInk1", "light": "lightPaper" },
"diffLineNumber": { "dark": "sumiInk3", "light": "#C7BEB4" }, "diffLineNumber": { "dark": "#9090a0", "light": "#65615c" },
"diffAddedLineNumberBg": { "dark": "#202820", "light": "#DDE8D6" }, "diffAddedLineNumberBg": { "dark": "#202820", "light": "#DDE8D6" },
"diffRemovedLineNumberBg": { "dark": "#2D1C1C", "light": "#F2DADA" }, "diffRemovedLineNumberBg": { "dark": "#2D1C1C", "light": "#F2DADA" },
"markdownText": { "dark": "fujiWhite", "light": "lightText" }, "markdownText": { "dark": "fujiWhite", "light": "lightText" },

View File

@ -129,10 +129,7 @@
"dark": "transparent", "dark": "transparent",
"light": "transparent" "light": "transparent"
}, },
"diffLineNumber": { "diffLineNumber": "textMuted",
"dark": "#666666",
"light": "#999999"
},
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "transparent", "dark": "transparent",
"light": "transparent" "light": "transparent"

View File

@ -128,8 +128,8 @@
"light": "lightBgAlt" "light": "lightBgAlt"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "#37474f", "dark": "#9aa2a6",
"light": "#cfd8dc" "light": "#6a6e70"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#2e3c2b", "dark": "#2e3c2b",

View File

@ -47,7 +47,7 @@
"diffAddedBg": { "dark": "#132616", "light": "#e0efde" }, "diffAddedBg": { "dark": "#132616", "light": "#e0efde" },
"diffRemovedBg": { "dark": "#261212", "light": "#f9e5e5" }, "diffRemovedBg": { "dark": "#261212", "light": "#f9e5e5" },
"diffContextBg": { "dark": "matrixInk1", "light": "lightPaper" }, "diffContextBg": { "dark": "matrixInk1", "light": "lightPaper" },
"diffLineNumber": { "dark": "matrixInk3", "light": "lightGray" }, "diffLineNumber": { "dark": "textMuted", "light": "#556156" },
"diffAddedLineNumberBg": { "dark": "#0f1b11", "light": "#d6e7d2" }, "diffAddedLineNumberBg": { "dark": "#0f1b11", "light": "#d6e7d2" },
"diffRemovedLineNumberBg": { "dark": "#1b1414", "light": "#f2d2d2" }, "diffRemovedLineNumberBg": { "dark": "#1b1414", "light": "#f2d2d2" },
"markdownText": { "dark": "rainGreenHi", "light": "lightText" }, "markdownText": { "dark": "rainGreenHi", "light": "lightText" },

View File

@ -114,8 +114,8 @@
"light": "#f0f0f0" "light": "#f0f0f0"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "#3e3d32", "dark": "#9b9b95",
"light": "#d0d0d0" "light": "#686868"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#1a3a1a", "dark": "#1a3a1a",

View File

@ -114,8 +114,8 @@
"light": "nightOwlPanel" "light": "nightOwlPanel"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "nightOwlMuted", "dark": "#7791a6",
"light": "nightOwlMuted" "light": "#7791a6"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#0a2e1a", "dark": "#0a2e1a",

View File

@ -116,8 +116,8 @@
"light": "nord5" "light": "nord5"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "nord2", "dark": "#a9aeb6",
"light": "nord4" "light": "textMuted"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#3B4252", "dark": "#3B4252",

View File

@ -51,7 +51,7 @@
"diffAddedBg": { "dark": "#2c382b", "light": "#eafbe9" }, "diffAddedBg": { "dark": "#2c382b", "light": "#eafbe9" },
"diffRemovedBg": { "dark": "#3a2d2f", "light": "#fce9e8" }, "diffRemovedBg": { "dark": "#3a2d2f", "light": "#fce9e8" },
"diffContextBg": { "dark": "darkBgAlt", "light": "lightBgAlt" }, "diffContextBg": { "dark": "darkBgAlt", "light": "lightBgAlt" },
"diffLineNumber": { "dark": "#495162", "light": "#c9c9ca" }, "diffLineNumber": { "dark": "#9398a2", "light": "#666666" },
"diffAddedLineNumberBg": { "dark": "#283427", "light": "#e1f3df" }, "diffAddedLineNumberBg": { "dark": "#283427", "light": "#e1f3df" },
"diffRemovedLineNumberBg": { "dark": "#36292b", "light": "#f5e2e1" }, "diffRemovedLineNumberBg": { "dark": "#36292b", "light": "#f5e2e1" },
"markdownText": { "dark": "darkFg", "light": "lightFg" }, "markdownText": { "dark": "darkFg", "light": "lightFg" },

View File

@ -138,8 +138,8 @@
"light": "lightStep2" "light": "lightStep2"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "darkStep3", "dark": "#8f8f8f",
"light": "lightStep3" "light": "#595959"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#1b2b34", "dark": "#1b2b34",

View File

@ -142,8 +142,8 @@
"light": "lightStep2" "light": "lightStep2"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "darkStep3", "dark": "diffContext",
"light": "lightStep3" "light": "#595755"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#162535", "dark": "#162535",

View File

@ -60,7 +60,7 @@
"diffAddedBg": { "dark": "#15241c", "light": "#e0eee5" }, "diffAddedBg": { "dark": "#15241c", "light": "#e0eee5" },
"diffRemovedBg": { "dark": "#241515", "light": "#eee0e0" }, "diffRemovedBg": { "dark": "#241515", "light": "#eee0e0" },
"diffContextBg": { "dark": "darkBg1", "light": "lightBg1" }, "diffContextBg": { "dark": "darkBg1", "light": "lightBg1" },
"diffLineNumber": { "dark": "darkBg3", "light": "lightBg3" }, "diffLineNumber": { "dark": "#828b87", "light": "#5f5e4f" },
"diffAddedLineNumberBg": { "dark": "#121f18", "light": "#d5e5da" }, "diffAddedLineNumberBg": { "dark": "#121f18", "light": "#d5e5da" },
"diffRemovedLineNumberBg": { "dark": "#1f1212", "light": "#e5d5d5" }, "diffRemovedLineNumberBg": { "dark": "#1f1212", "light": "#e5d5d5" },
"markdownText": { "dark": "darkFg0", "light": "lightFg0" }, "markdownText": { "dark": "darkFg0", "light": "lightFg0" },

View File

@ -115,8 +115,8 @@
"light": "#f5f5f5" "light": "#f5f5f5"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "#444760", "dark": "#a0a2af",
"light": "#cfd8dc" "light": "#6a6e70"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#2e3c2b", "dark": "#2e3c2b",

View File

@ -127,8 +127,8 @@
"light": "dawnSurface" "light": "dawnSurface"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "muted", "dark": "#9491a6",
"light": "dawnMuted" "light": "#6c6875"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#1f2d3a", "dark": "#1f2d3a",

View File

@ -116,8 +116,8 @@
"light": "base2" "light": "base2"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "base01", "dark": "#8b9b9f",
"light": "base1" "light": "#5f6969"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#073642", "dark": "#073642",

View File

@ -119,8 +119,8 @@
"light": "#f5f5f5" "light": "#f5f5f5"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "#495495", "dark": "#959bc1",
"light": "#b0b0b0" "light": "textMuted"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#1a3a2a", "dark": "#1a3a2a",

View File

@ -136,8 +136,8 @@
"light": "lightStep2" "light": "lightStep2"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "darkStep3", "dark": "#8f909a",
"light": "lightStep3" "light": "#59595b"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#1b2b34", "dark": "#1b2b34",

View File

@ -138,8 +138,8 @@
"light": "lightBackground" "light": "lightBackground"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "gray600", "dark": "#8a8a8a",
"light": "lightGray600" "light": "textMuted"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#0F2613", "dark": "#0F2613",

View File

@ -111,8 +111,8 @@
"light": "#F8F8F8" "light": "#F8F8F8"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "#505050", "dark": "textMuted",
"light": "#808080" "light": "#6a6a6a"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#0d2818", "dark": "#0d2818",

View File

@ -116,8 +116,8 @@
"light": "#f5f5e5" "light": "#f5f5e5"
}, },
"diffLineNumber": { "diffLineNumber": {
"dark": "#6f6f6f", "dark": "#d2d2d2",
"light": "#b0b0a0" "light": "textMuted"
}, },
"diffAddedLineNumberBg": { "diffAddedLineNumberBg": {
"dark": "#4f5f4f", "dark": "#4f5f4f",