Skip to content

feat(app): better themes #16889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdotdevin merged 5 commits into from
Mar 12, 2026
Merged

feat(app): better themes #16889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c24f440
wip(app): colors
adamdotdevin Mar 10, 2026
781104c
wip(app): colors
adamdotdevin Mar 10, 2026
3bc1e8b
fix: oc-2
adamdotdevin Mar 12, 2026
1d2da40
Merge branch 'dev' into colors
adamdotdevin Mar 12, 2026
1527938
fix: build:
adamdotdevin Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 44 additions & 6 deletions packages/ui/src/theme/color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,25 @@ export function generateScale(seed: HexColor, isDark: boolean): HexColor[] {
const scale: HexColor[] = []

const lightSteps = isDark
? [0.182, 0.21, 0.261, 0.302, 0.341, 0.387, 0.443, 0.514, base.l, Math.max(0, base.l - 0.017), 0.8, 0.93]
: [0.993, 0.983, 0.962, 0.936, 0.906, 0.866, 0.811, 0.74, base.l, Math.max(0, base.l - 0.036), 0.548, 0.33]
? [
0.182,
0.21,
0.261,
0.302,
0.341,
0.387,
0.443,
0.514,
base.l,
Math.max(0, base.l - 0.017),
Math.min(0.94, Math.max(0.84, base.l + 0.02)),
0.975,
]
: [0.993, 0.983, 0.962, 0.936, 0.906, 0.866, 0.811, 0.74, base.l, Math.max(0, base.l - 0.036), 0.49, 0.27]

const chromaMultipliers = isDark
? [0.205, 0.275, 0.46, 0.62, 0.71, 0.79, 0.87, 0.97, 1.04, 1.03, 1, 0.58]
: [0.045, 0.128, 0.34, 0.5, 0.61, 0.69, 0.77, 0.89, 1, 1, 0.97, 0.56]
? [0.34, 0.45, 0.64, 0.82, 0.96, 1.06, 1.14, 1.2, 1.24, 1.28, 1.34, 1.08]
: [0.12, 0.24, 0.46, 0.68, 0.84, 0.98, 1.08, 1.16, 1.22, 1.26, 1.18, 0.98]

for (let i = 0; i < 12; i++) {
scale.push(
Expand All @@ -155,10 +168,35 @@ export function generateScale(seed: HexColor, isDark: boolean): HexColor[] {
return scale
}

export function generateNeutralScale(seed: HexColor, isDark: boolean): HexColor[] {
export function generateNeutralScale(seed: HexColor, isDark: boolean, ink?: HexColor): HexColor[] {
if (ink) {
const base = hexToOklch(seed)
const lift = (tone: number) =>
oklchToHex({
l: base.l + (1 - base.l) * tone,
c: base.c * Math.max(0, 1 - tone),
h: base.h,
})
const sink = (tone: number) =>
oklchToHex({
l: base.l * (1 - tone),
c: base.c * Math.max(0, 1 - tone * 0.3),
h: base.h,
})
const bg = isDark
? sink(clamp(0.06 + Math.max(0, base.l - 0.18) * 0.22 + base.c * 1.4, 0.06, 0.14))
: base.l < 0.82
? lift(0.86)
: lift(clamp(0.1 + base.c * 3.2 + Math.max(0, 0.95 - base.l) * 0.35, 0.1, 0.28))
const steps = isDark
? [0, 0.03, 0.055, 0.085, 0.125, 0.18, 0.255, 0.35, 0.5, 0.67, 0.84, 0.975]
: [0, 0.022, 0.042, 0.068, 0.102, 0.146, 0.208, 0.296, 0.432, 0.61, 0.81, 0.965]
return steps.map((step) => mixColors(bg, ink, step))
}

const base = hexToOklch(seed)
const scale: HexColor[] = []
const neutralChroma = Math.min(base.c, 0.02)
const neutralChroma = Math.min(base.c, isDark ? 0.05 : 0.04)

const lightSteps = isDark
? [0.2, 0.226, 0.256, 0.277, 0.301, 0.325, 0.364, 0.431, base.l, 0.593, 0.706, 0.946]
Expand Down
315 changes: 175 additions & 140 deletions packages/ui/src/theme/resolve.ts
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 14 additions & 2 deletions packages/ui/src/theme/themes/aura.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@
"diffDelete": "#f5b3b3"
},
"overrides": {
"syntax-keyword": "#7b5ae0"
"syntax-comment": "#8d88a3",
"syntax-keyword": "#7b5ae0",
"syntax-string": "#2b8a57",
"syntax-primitive": "#2f78b8",
"syntax-property": "#a96a22",
"syntax-type": "#2b8a57",
"syntax-constant": "#d94f4f"
}
},
"dark": {
Expand All @@ -33,7 +39,13 @@
"diffDelete": "#ff6767"
},
"overrides": {
"syntax-keyword": "#a277ff"
"syntax-comment": "#6d6a7e",
"syntax-keyword": "#a277ff",
"syntax-string": "#61ffca",
"syntax-primitive": "#82e2ff",
"syntax-property": "#ffca85",
"syntax-type": "#61ffca",
"syntax-constant": "#ff6767"
}
}
}
16 changes: 14 additions & 2 deletions packages/ui/src/theme/themes/ayu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@
"diffDelete": "#e6656a"
},
"overrides": {
"syntax-keyword": "#ea9f41"
"syntax-comment": "#6e7681",
"syntax-keyword": "#c76a1a",
"syntax-string": "#6f8f00",
"syntax-primitive": "#b87500",
"syntax-property": "#2f86b7",
"syntax-type": "#227fc0",
"syntax-constant": "#a37acc"
}
},
"dark": {
Expand All @@ -33,7 +39,13 @@
"diffDelete": "#f58572"
},
"overrides": {
"syntax-keyword": "#ffad66"
"syntax-comment": "#5a6673",
"syntax-keyword": "#ff8f40",
"syntax-string": "#aad94c",
"syntax-primitive": "#ffb454",
"syntax-property": "#39bae6",
"syntax-type": "#59c2ff",
"syntax-constant": "#d2a6ff"
}
}
}
16 changes: 14 additions & 2 deletions packages/ui/src/theme/themes/carbonfox.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@
"diffDelete": "#da1e28"
},
"overrides": {
"syntax-keyword": "#8a3ffc"
"syntax-comment": "#6f6f6f",
"syntax-keyword": "#8a3ffc",
"syntax-string": "#198038",
"syntax-primitive": "#0f62fe",
"syntax-property": "#0043ce",
"syntax-type": "#8a5f00",
"syntax-constant": "#da1e28"
}
},
"dark": {
Expand All @@ -35,7 +41,13 @@
"diffDelete": "#ff8389"
},
"overrides": {
"syntax-keyword": "#be95ff"
"syntax-comment": "#6f6f6f",
"syntax-keyword": "#be95ff",
"syntax-string": "#42be65",
"syntax-primitive": "#33b1ff",
"syntax-property": "#78a9ff",
"syntax-type": "#f1c21b",
"syntax-constant": "#ff8389"
}
}
}
8 changes: 6 additions & 2 deletions packages/ui/src/theme/themes/catppuccin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
"diffDelete": "#e78284"
},
"overrides": {
"syntax-comment": "#6c7086",
"syntax-keyword": "#8839ef",
"syntax-primitive": "#fe640b"
"syntax-primitive": "#1e66f5",
"syntax-constant": "#ca6702"
}
},
"dark": {
Expand All @@ -34,8 +36,10 @@
"diffDelete": "#f38ba8"
},
"overrides": {
"syntax-comment": "#6c7086",
"syntax-keyword": "#cba6f7",
"syntax-primitive": "#fab387"
"syntax-primitive": "#89b4fa",
"syntax-constant": "#fab387"
}
}
}
10 changes: 8 additions & 2 deletions packages/ui/src/theme/themes/dracula.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
"diffDelete": "#f8a1b8"
},
"overrides": {
"syntax-comment": "#7d7f97",
"syntax-keyword": "#d16090",
"syntax-string": "#596600",
"syntax-primitive": "#7c6bf5"
"syntax-primitive": "#2f8f57",
"syntax-property": "#1d7fc5",
"syntax-constant": "#7c6bf5"
}
},
"dark": {
Expand All @@ -35,9 +38,12 @@
"diffDelete": "#ff6b81"
},
"overrides": {
"syntax-comment": "#6272a4",
"syntax-keyword": "#ff79c6",
"syntax-string": "#f1fa8c",
"syntax-primitive": "#bd93f9"
"syntax-primitive": "#50fa7b",
"syntax-property": "#8be9fd",
"syntax-constant": "#bd93f9"
}
}
}
8 changes: 6 additions & 2 deletions packages/ui/src/theme/themes/gruvbox.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
"diffDelete": "#9d0006"
},
"overrides": {
"syntax-comment": "#928374",
"syntax-keyword": "#9d0006",
"syntax-primitive": "#8f3f71"
"syntax-primitive": "#076678",
"syntax-constant": "#8f3f71"
}
},
"dark": {
Expand All @@ -34,8 +36,10 @@
"diffDelete": "#fb4934"
},
"overrides": {
"syntax-comment": "#928374",
"syntax-keyword": "#fb4934",
"syntax-primitive": "#d3869b"
"syntax-primitive": "#83a598",
"syntax-constant": "#d3869b"
}
}
}
10 changes: 8 additions & 2 deletions packages/ui/src/theme/themes/monokai.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
"diffDelete": "#f6a3ae"
},
"overrides": {
"syntax-comment": "#8a816f",
"syntax-keyword": "#d9487c",
"syntax-string": "#8a6500",
"syntax-primitive": "#bf7bff"
"syntax-primitive": "#3c8d2f",
"syntax-property": "#1f88c8",
"syntax-constant": "#9b5fe0"
}
},
"dark": {
Expand All @@ -35,9 +38,12 @@
"diffDelete": "#f4477c"
},
"overrides": {
"syntax-comment": "#75715e",
"syntax-keyword": "#f92672",
"syntax-string": "#e6db74",
"syntax-primitive": "#ae81ff"
"syntax-primitive": "#a6e22e",
"syntax-property": "#66d9ef",
"syntax-constant": "#ae81ff"
}
}
}
8 changes: 6 additions & 2 deletions packages/ui/src/theme/themes/nightowl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@
"diffDelete": "#de3d3b"
},
"overrides": {
"syntax-keyword": "#994cc3"
"syntax-comment": "#7a8181",
"syntax-keyword": "#994cc3",
"syntax-primitive": "#4876d6",
"syntax-constant": "#c96765"
}
},
"dark": {
Expand All @@ -36,7 +39,8 @@
"syntax-comment": "#637777",
"syntax-keyword": "#c792ea",
"syntax-string": "#ecc48d",
"syntax-primitive": "#f78c6c"
"syntax-primitive": "#82aaff",
"syntax-constant": "#f78c6c"
}
}
}
10 changes: 7 additions & 3 deletions packages/ui/src/theme/themes/nord.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
"diffDelete": "#bf616a"
},
"overrides": {
"syntax-comment": "#6b7282",
"syntax-keyword": "#5e81ac",
"syntax-string": "#a3be8c",
"syntax-primitive": "#b48ead"
"syntax-string": "#6f8758",
"syntax-primitive": "#5e81ac",
"syntax-constant": "#8d6886"
}
},
"dark": {
Expand All @@ -35,8 +37,10 @@
"diffDelete": "#bf616a"
},
"overrides": {
"syntax-comment": "#616e88",
"syntax-keyword": "#81a1c1",
"syntax-primitive": "#b48ead"
"syntax-primitive": "#88c0d0",
"syntax-constant": "#b48ead"
}
}
}
20 changes: 20 additions & 0 deletions packages/ui/src/theme/themes/oc-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@
"diffDelete": "#fc533a"
},
"overrides": {
"syntax-comment": "#7a7a7a",
"syntax-keyword": "#a753ae",
"syntax-string": "#00ceb9",
"syntax-primitive": "#034cff",
"syntax-property": "#a753ae",
"syntax-type": "#8a6f00",
"syntax-constant": "#007b80",
"syntax-critical": "#ff8c00",
"syntax-diff-delete": "#ff8c00",
"syntax-diff-unknown": "#a753ae",
"surface-critical-base": "#FFF2F0"
}
},
Expand All @@ -31,6 +41,16 @@
"diffDelete": "#fc533a"
},
"overrides": {
"syntax-comment": "#8f8f8f",
"syntax-keyword": "#edb2f1",
"syntax-string": "#00ceb9",
"syntax-primitive": "#8cb0ff",
"syntax-property": "#fab283",
"syntax-type": "#fcd53a",
"syntax-constant": "#93e9f6",
"syntax-critical": "#fab283",
"syntax-diff-delete": "#fab283",
"syntax-diff-unknown": "#edb2f1",
"surface-critical-base": "#1F0603"
}
}
Expand Down
8 changes: 6 additions & 2 deletions packages/ui/src/theme/themes/onedarkpro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
"diffDelete": "#f7c1c5"
},
"overrides": {
"syntax-comment": "#6a717d",
"syntax-keyword": "#a626a4",
"syntax-primitive": "#986801"
"syntax-primitive": "#4078f2",
"syntax-constant": "#986801"
}
},
"dark": {
Expand All @@ -34,8 +36,10 @@
"diffDelete": "#b2555f"
},
"overrides": {
"syntax-comment": "#5c6370",
"syntax-keyword": "#c678dd",
"syntax-primitive": "#d19a66"
"syntax-primitive": "#61afef",
"syntax-constant": "#d19a66"
}
}
}
16 changes: 14 additions & 2 deletions packages/ui/src/theme/themes/shadesofpurple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@
"diffDelete": "#ffc3ef"
},
"overrides": {
"syntax-keyword": "#ff6bd5"
"syntax-comment": "#8e4be3",
"syntax-keyword": "#c45f00",
"syntax-string": "#2f8b32",
"syntax-primitive": "#a13bd6",
"syntax-property": "#008fb8",
"syntax-type": "#9d7a00",
"syntax-constant": "#e04d7a"
}
},
"dark": {
Expand All @@ -33,7 +39,13 @@
"diffDelete": "#d85aa0"
},
"overrides": {
"syntax-keyword": "#ff7ac6"
"syntax-comment": "#b362ff",
"syntax-keyword": "#ff9d00",
"syntax-string": "#a5ff90",
"syntax-primitive": "#fb94ff",
"syntax-property": "#9effff",
"syntax-type": "#fad000",
"syntax-constant": "#ff628c"
}
}
}
Loading
Loading