SemianiakaVY/openpencil
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

feat(editor): add shadcn input/ring/secondary/destructive-foreground tokens to Theme

Browse source 
Theme gains the canonical shadcn fields; button::tokens_from_theme maps them into jian Tokens (+ radius 6.0). Unblocks the Switch off-track=input reconciliation and Button secondary variant. Bumps vendor/jian to 9cd5d50.
This commit is contained in:
Kayshen-X 2026-06-20 00:24:00 +08:00
parent fef880b8a5
commit 6e43abd5ef
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/op-editor-ui/src/theme.rs
View file

@ -58,6 +58,15 @@ pub struct Theme {
pub accent: Color,
pub accent_foreground: Color,
pub destructive: Color,
/// Text on a `destructive` surface (shadcn `--destructive-foreground`).
pub destructive_foreground: Color,
/// Secondary neutral surface + its foreground (shadcn `--secondary`).
pub secondary: Color,
pub secondary_foreground: Color,
/// Form-field border (shadcn `--input`) — input box + switch off-track.
pub input: Color,
/// Focus-visible ring color (shadcn `--ring`).
pub ring: Color,
/// Solid background of an icon-only toolbar button on hover.
pub button_hover: Color,
/// Slightly lighter than `card` — used for the active page
@ -93,6 +102,11 @@ impl Theme {
accent: rgb(0x26, 0x26, 0x26),
accent_foreground: rgb(0xfa, 0xfa, 0xfa),
destructive: rgb(0xef, 0x44, 0x44),
destructive_foreground: rgb(0xfa, 0xfa, 0xfa),
secondary: rgb(0x26, 0x26, 0x26),
secondary_foreground: rgb(0xfa, 0xfa, 0xfa),
input: rgb(0x2a, 0x2a, 0x2a),
ring: rgb(0x3b, 0x82, 0xf6),
button_hover: rgba(0xff, 0xff, 0xff, 0.06),
row_selected: rgb(0x26, 0x26, 0x26),
row_selected_primary: rgba(0x3b, 0x82, 0xf6, 0.18),
@ -120,6 +134,11 @@ impl Theme {
accent: rgb(0xf5, 0xf5, 0xf5),
accent_foreground: rgb(0x0a, 0x0a, 0x0a),
destructive: rgb(0xef, 0x44, 0x44),
destructive_foreground: rgb(0xfa, 0xfa, 0xfa),
secondary: rgb(0xf5, 0xf5, 0xf5),
secondary_foreground: rgb(0x0a, 0x0a, 0x0a),
input: rgb(0xe5, 0xe5, 0xe5),
ring: rgb(0x3b, 0x82, 0xf6),
button_hover: rgba(0x00, 0x00, 0x00, 0.06),
row_selected: rgb(0xe5, 0xe5, 0xe5),
row_selected_primary: rgba(0x3b, 0x82, 0xf6, 0.15),

6
crates/op-editor-ui/src/widgets/button.rs
View file

@ -18,9 +18,15 @@ pub(crate) fn tokens_from_theme(theme: &Theme) -> Tokens {
accent: theme.accent,
accent_foreground: theme.accent_foreground,
destructive: theme.destructive,
destructive_foreground: theme.destructive_foreground,
secondary: theme.secondary,
secondary_foreground: theme.secondary_foreground,
input: theme.input,
ring: theme.ring,
button_hover: theme.button_hover,
row_selected: theme.row_selected,
row_selected_primary: theme.row_selected_primary,
radius: 6.0,
density: Density::Desktop,
}
}

2
vendor/jian vendored

@ -1 +1 @@
Subproject commit eb58f8fb4f635437b6c6147310723a75138e6a10
Subproject commit 9cd5d50db31daa142a4d3809a1f57875403fbca6