Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion defaults/AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,7 @@ All of it is in `herdr.d.ts`. In short:
(every core terminal), `focused()`, `layout()`, `theme()` (every color by
name: background (the terminals', cards), canvas (behind cards), chrome
(sidebars, bars), surface, popover, raised, hover, selected, border,
input (a stronger border), foreground, muted, dim, accent,
input (text fields, a stronger border), foreground, muted, dim, accent,
accent_foreground, solid and solid_foreground (a primary button),
selection, working, blocked, done, idle, unknown, ansi0..15; light and
dark themes name the same ones), `settings()` (with `dark`: the
Expand Down
2 changes: 1 addition & 1 deletion defaults/frame/feedback/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default class Feedback extends View {
const body = preview.body;
const disabled = !preview.available || this.sending || !this.message.value().trim();
const label = (text) => div().text_size(13).text_color(t.muted).child(text);
const field = (el) => el.w_full().p(10).rounded(7).border_1().border_color(t.border).bg(t.background).text_color(t.foreground).text_size(14);
const field = (el) => el.w_full().p(10).rounded(7).border_1().border_color(t.border).bg(t.input).text_color(t.foreground).text_size(14);
return v_flex().id("feedback").track_focus(this.handle).w_full().min_h(0).h(650).bg(t.popover)
.on_drop((e, cx) => {
if (this.sending || this.sent) return;
Expand Down
2 changes: 1 addition & 1 deletion defaults/frame/palette/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ export default class Palette extends View {
.rounded(9)
.border_1()
.border_color(t.accent)
.bg(t.background)
.bg(t.input)
.child(svg(win()?.platform === "macos" ? "frame/palette/command.svg" : "mods/workspace-chrome/search.svg").size(16).text_color(t.dim))
.child(Input.new(this.input).flex_1().h_full().text_size(12.8).text_color(t.foreground))
.child(div().text_size(11).text_color(t.dim).child("Esc")),
Expand Down
4 changes: 2 additions & 2 deletions defaults/frame/settings/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ export default class Settings extends View {
.border_b(1)
.border_color(t.border)
.text_size(13)
.child(Input.new(this.fontInput).h(28).text_color(t.foreground)),
.child(Input.new(this.fontInput).h(28).bg(t.input).text_color(t.foreground)),
)
.child(
div()
Expand Down Expand Up @@ -714,7 +714,7 @@ export default class Settings extends View {
else row.child(v_flex().gap(6)
.child(div().text_size(12).text_color(t.dim).child("New name (addresses using the old name stop working)"))
.child(h_flex().gap(6).items_center()
.child(Input.new(this.renameInput).flex_1().min_w(0).h(32).px(10).rounded(7).border_1().border_color(this.renameFocused ? t.accent : t.input).bg(t.background).text_size(13).text_color(t.foreground))
.child(Input.new(this.renameInput).flex_1().min_w(0).h(32).px(10).rounded(7).border_1().border_color(this.renameFocused ? t.accent : t.input).bg(t.input).text_size(13).text_color(t.foreground))
.child(cancel).child(this.button(t, `st-m-save-${m.name}`, "Save", (_e, cx) => this.machineAction(m.name, "rename", cx, edit.name)))));
}
if (result) row.child(div().text_size(12.5).text_color(result.ok ? t.ansi2 : t.blocked).child(result.message));
Expand Down
4 changes: 2 additions & 2 deletions defaults/herdr.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,8 @@ export function placement(): {
} | null;

/** Every theme color by name: background (the terminals'), surface, canvas (behind cards),
* chrome (sidebars and bars), popover, raised, hover, selected, border, input, foreground,
* muted, dim, accent, accent_foreground, solid and solid_foreground (a primary button: ink on
* chrome (sidebars and bars), popover, raised, hover, selected, border, input (text fields),
* foreground, muted, dim, accent, accent_foreground, solid and solid_foreground (a primary button: ink on
* paper, paper on ink), selection, working, blocked, done, idle, unknown, ansi0..ansi15.
* Light and dark themes name the same colors, so a mod that uses them follows both. */
export function theme(): Record<string, string>;
Expand Down
2 changes: 1 addition & 1 deletion defaults/mods/changes/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export default class Changes extends View {
.when(!this.open && this.files.length > 0, (e) => e.child(div().absolute().top(6).px(12).text_color(t.dim).child("Select a file to view its changes"))))
.when(Boolean(this.note), (e) => e.child(div().px(10).pb(8).text_size(11).text_color(t.ansi1).child(this.note)))
.child(h_flex().flex_none().p(10).gap(8).border_t(1).border_color(t.border)
.child(div().id("commit-message").flex_1().min_w(0).h(32).px(10).flex().items_center().rounded(8).border_1().border_color(this.typing ? t.accent : t.border).cursor_text().on_mouse_down("left", (_e, cx) => cx.stop_propagation()).child(Input.new(this.input).h_full().text_size(12).text_color(t.foreground)))
.child(div().id("commit-message").flex_1().min_w(0).h(32).px(10).flex().items_center().rounded(8).border_1().border_color(this.typing ? t.accent : t.border).bg(t.input).cursor_text().on_mouse_down("left", (_e, cx) => cx.stop_propagation()).child(Input.new(this.input).h_full().text_size(12).text_color(t.foreground)))
.child(div().id("commit").h(32).px(14).flex().items_center().rounded(8).bg(enabled ? t.solid : t.raised).text_color(enabled ? t.solid_foreground : t.dim).text_size(12).when(enabled, (e) => e.cursor_pointer()).on_click((_e, cx) => this.commit(cx)).child(this.busy ? "Committing…" : "Commit")));
}
}
2 changes: 1 addition & 1 deletion defaults/mods/help/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default class Help extends View {
.child(div().text_size(15).font_semibold().text_color(t.foreground).child("Keybinds"))
.child(div().id("help-esc").px(6).py(2).rounded(5).text_size(11).text_color(t.dim).cursor_pointer().hover((s) => s.bg(t.hover).text_color(t.foreground)).on_click(() => closeOverlay(props().overlay)).child("Esc")),
)
.child(Input.new(this.input).h(36).flex_none().px(10).rounded(9).border_1().border_color(t.accent).bg(t.background).text_size(12.8).text_color(t.foreground))
.child(Input.new(this.input).h(36).flex_none().px(10).rounded(9).border_1().border_color(t.accent).bg(t.input).text_size(12.8).text_color(t.foreground))
.child(
v_flex()
.flex_1()
Expand Down
2 changes: 1 addition & 1 deletion defaults/mods/machine-add/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ export default class MachineAdd extends View {
.rounded(8)
.border_1()
.border_color(this.inputFocused ? t.accent : t.input)
.bg(t.background)
.bg(t.input)
.text_size(13)
.text_color(t.foreground),
)
Expand Down
2 changes: 1 addition & 1 deletion defaults/mods/picker/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export default class Picker extends View {
})
.child(h_flex().items_center().child(div().flex_1().text_size(15).font_semibold().text_color(t.foreground).child("Go to…")).child(div().id("picker-esc").px(6).py(2).rounded(5).text_size(11).text_color(t.dim).cursor_pointer().hover((s) => s.bg(t.hover).text_color(t.foreground)).on_click(() => this.close()).child("Esc")))
.child(
h_flex().h(36).flex_none().px(10).gap(8).items_center().rounded(9).border_1().border_color(t.accent).bg(t.background)
h_flex().h(36).flex_none().px(10).gap(8).items_center().rounded(9).border_1().border_color(t.accent).bg(t.input)
.child(svg("mods/workspace-chrome/search.svg").size(15).text_color(t.dim))
.child(Input.new(this.input).flex_1().h_full().text_size(12.8).text_color(t.foreground)),
)
Expand Down
2 changes: 1 addition & 1 deletion defaults/mods/prompt/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default class Prompt extends View {
.child(h_flex().items_center().child(div().flex_1().text_size(15).font_semibold().child((p.title ?? "").replace(/^./, (c) => c.toUpperCase())))
.child(div().text_size(11).text_color(t.dim).child("Esc")))
.child(label("Name"))
.child(Input.new(this.input).h(36).px(10).rounded(9).border_1().border_color(this.inputFocused ? t.accent : t.input).bg(t.background).text_size(12.8).text_color(t.foreground))
.child(Input.new(this.input).h(36).px(10).rounded(9).border_1().border_color(this.inputFocused ? t.accent : t.input).bg(t.input).text_size(12.8).text_color(t.foreground))
.when(Boolean(p.hint), el => el.child(div().pt(6).text_size(11.5).text_color(t.dim).child(p.hint)))
.child(h_flex().pt(20).gap(8).justify_end()
.child(button("pm-cancel", "Cancel", false, () => closeOverlay(p.overlay)))
Expand Down
4 changes: 2 additions & 2 deletions defaults/mods/worktree/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ export default class Worktree extends View {
.when(r === null, (el) => el.child(div().text_color(t.muted).child(`${this.folder ? tilde(this.folder, this.userHome ?? "") : "This folder"} is not in a git repository.`)))
.when(Boolean(r && this.list), (el) =>
el
.child(Input.new(this.input).h(32).px(10).items_center().rounded(6).border(1).border_color(this.inputFocused ? t.accent : t.input).bg(t.background).text_color(t.foreground))
.child(Input.new(this.input).h(32).px(10).items_center().rounded(6).border(1).border_color(this.inputFocused ? t.accent : t.input).bg(t.input).text_color(t.foreground))
.child(
div()
.relative()
Expand Down Expand Up @@ -363,7 +363,7 @@ export default class Worktree extends View {
.rounded(6)
.border(1)
.border_color(this.inputFocused ? t.accent : t.input)
.bg(t.background)
.bg(t.input)
.text_color(t.foreground),
),
)
Expand Down
1 change: 1 addition & 0 deletions defaults/themes/win98.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"accent": "#000080",
"accent_foreground": "#ffffff",
"ring": "#000000",
"selection": "#00008080",
"working": "#808000",
"blocked": "#ff0000",
"done": "#0000ff",
Expand Down
3 changes: 2 additions & 1 deletion src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,11 @@ const PREVIOUS_THEMES: &[(&str, &str)] = &[
"selection": "#000080",
"cursor": "#c0c0c0",
"ansi": [
"#000000", "#aa0000", "#00aa00", "#aa5500", "#0000aa", "#aa00aa", "#00aaaa", "#aaaaaa",
"#555555", "#aa0000", "#00aa00", "#aa5500", "#0000bb", "#aa00aa", "#00aaaa", "#aaaaaa",
"#555555", "#ff5555", "#55ff55", "#ffff55", "#5555ff", "#ff55ff", "#55ffff", "#ffffff"
],
"colors": {
"background": "#000000",
"foreground": "#000000",
"surface": "#c0c0c0",
"popover": "#c0c0c0",
Expand Down
Loading