Merged
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 crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1810,7 +1810,7 @@ impl Render for ChatView {
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.flex_1()
.min_h_0()
.py_6();
.py_4();

let composer: AnyElement = if native_subagent_readonly {
div()
Expand Down
50 changes: 29 additions & 21 deletions crates/ui/src/composer/components/checkout.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ impl Composer {
let right: AnyElement = if turn_running {
Button::new("branch-picker")
.ghost()
.outline()
.compact()
.tooltip(crate::tr!("composer.wait_turn"))
.child(
Expand All@@ -39,16 +40,20 @@ impl Composer {
let store_open = self.workspace_store.clone();
let store_content = self.workspace_store.clone();
let current = picker_current.clone();
let trigger = Button::new("branch-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("branch-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("branch-popover")
.anchor(Anchor::BottomRight)
.trigger(trigger)
Expand DownExpand Up@@ -158,7 +163,6 @@ impl Composer {
h_flex()
.w_full()
.px_2()
.pt_2()
.items_center()
.justify_between()
.text_size(px(13.))
Expand DownExpand Up@@ -199,16 +203,20 @@ impl Composer {

let store_content = self.workspace_store.clone();
let base_default = base_default.to_string();
let trigger = Button::new("workspace-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("workspace-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("workspace-popover")
.anchor(Anchor::BottomLeft)
.trigger(trigger)
Expand Down
3 changes: 3 additions & 0 deletions crates/ui/src/composer/components/pickers.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@ impl Composer {

let trigger = Button::new("model-picker")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand DownExpand Up@@ -286,6 +287,7 @@ impl Composer {

let trigger = Button::new("traits-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_chip())
Expand DownExpand Up@@ -406,6 +408,7 @@ impl Composer {

let trigger = Button::new("permission-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand Down
4 changes: 2 additions & 2 deletions crates/ui/src/composer/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1024,8 +1024,8 @@ impl Render for Composer {
.w_full()
.items_center()
.px(px(crate::chat::CONTENT_MIN_PADDING))
.pt_2()
.pb_3()
.pt_1()
.pb_2()
// Shift+Tab toggles Build ↔ Plan (S1 §4).
.on_key_down(cx.listener(|this, ev: &gpui::KeyDownEvent, _, cx| {
if ev.keystroke.key == "tab" && ev.keystroke.modifiers.shift {
Expand Down
23 changes: 14 additions & 9 deletions crates/ui/src/diff/view.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -828,15 +828,19 @@ impl DiffPanel {
let panel = cx.entity();
let session_selector = session.clone();

let trigger = Button::new("diff-turn-select").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("diff-turn-select")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);

let selector = Popover::new("diff-turn-popover")
.trigger(trigger)
Expand DownExpand Up@@ -1087,6 +1091,7 @@ impl DiffPanel {
let session_base = session.clone();
let trigger = Button::new("diff-base-select")
.ghost()
.outline()
.compact()
.label(current.clone())
.icon(IconName::ChevronDown);
Expand Down
5 changes: 3 additions & 2 deletions crates/ui/src/orchestrate_settings.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,10 +545,11 @@ impl OrchestrateSettingsPanel {
}
ChildApprovalMode::Manual => crate::tr!("orchestrate.child_approval.manual"),
};
// Ghost, not outline: a quiet resting trigger that only tints on hover,
// consistent with the General page dropdowns and the composer picker.
// A quiet resting trigger that only tints on hover, consistent with the
// General page dropdowns and the composer picker.
let trigger = Button::new("orchestrate-child-approval-dropdown")
.ghost()
.outline()
.compact()
.child(
h_flex()
Expand Down
2 changes: 2 additions & 0 deletions crates/ui/src/provider_card.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,6 +322,8 @@ impl ProviderCard {
let store = self.store.clone();

crate::material::overlay_popover("update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("update-available")
.ghost()
Expand Down
39 changes: 21 additions & 18 deletions crates/ui/src/provider_model_picker.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,27 @@ impl ProviderModelPicker {
});
let display = self.display_name(provider, model, profile_id, cx);
let glyph = tinted_glyph(&self.store, provider, profile_id, cx);
// Ghost, not outline: a quiet resting trigger (glyph + value +
// muted chevron) that only tints on hover, matching the
// composer's model picker. The "Add" variant stays an outlined
// action button.
Button::new(self.trigger_id).ghost().compact().child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
// A quiet resting trigger (glyph + value + muted chevron) that
// only tints on hover, matching the composer's model picker; the
// hairline marks it as a dropdown.
Button::new(self.trigger_id)
.ghost()
.outline()
.compact()
.child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions crates/ui/src/settings_page.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -825,6 +825,8 @@ impl SettingsPage {
let release_url = status.release_url.unwrap_or_default();

crate::material::overlay_popover("tcode-update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("tcode-update-available")
.ghost()
Expand DownExpand Up@@ -1555,11 +1557,10 @@ impl SettingsPage {
label: impl Into<SharedString>,
cx: &Context<Self>,
) -> Button {
// Ghost, not outline: transparent at rest (value + muted chevron) with a
// light tint only on hover — the same quiet trigger the composer's model
// picker uses. An outlined trigger reads as a card nested inside the
// already-bordered group.
Button::new(id).ghost().compact().child(
// Ghost fill (transparent at rest, light tint on hover) over a hairline
// outline — the same quiet trigger the composer's model picker uses, but
// bordered so it reads as a dropdown rather than plain text.
Button::new(id).ghost().outline().compact().child(
gpui_base::h_flex()
.w(px(160.))
.items_center()
Expand Down
5 changes: 4 additions & 1 deletion crates/ui/src/widgets/button.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,10 @@ impl RenderOnce for Button {
theme.success.opacity(0.3),
theme.success,
),
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, transparent),
// Transparent at rest; the hairline only shows with `.outline()`
// (border width is 0 otherwise), which is how select/dropdown
// triggers read as interactive controls.
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, theme.border),
ButtonVariant::Text => (
transparent,
theme.foreground.opacity(0.9),
Expand Down
3 changes: 1 addition & 2 deletions crates/ui/src/widgets/menu.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,6 @@ impl Render for PopupMenu {
.min_w(px(160.))
.max_w(px(420.))
.p_1()
.gap_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand All@@ -217,7 +216,7 @@ impl Render for PopupMenu {
for (index, item) in self.items.iter().enumerate() {
match item {
MenuItem::Separator => {
root = root.child(div().h(px(1.)).mx_1().bg(cx.theme().border))
root = root.child(div().h(px(1.)).mx_1().my_1().bg(cx.theme().border))
}
MenuItem::Item {
label,
Expand Down
2 changes: 1 addition & 1 deletion crates/ui/src/widgets/popover.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ impl RenderOnce for Popover {
.id("tcode-popover-content")
.occlude()
.when(appearance, |el| {
el.p_3()
el.p_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
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 crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1810,7 +1810,7 @@ impl Render for ChatView {
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.flex_1()
.min_h_0()
.py_6();
.py_4();

let composer: AnyElement = if native_subagent_readonly {
div()
Expand Down
50 changes: 29 additions & 21 deletions crates/ui/src/composer/components/checkout.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ impl Composer {
let right: AnyElement = if turn_running {
Button::new("branch-picker")
.ghost()
.outline()
.compact()
.tooltip(crate::tr!("composer.wait_turn"))
.child(
Expand All@@ -39,16 +40,20 @@ impl Composer {
let store_open = self.workspace_store.clone();
let store_content = self.workspace_store.clone();
let current = picker_current.clone();
let trigger = Button::new("branch-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("branch-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("branch-popover")
.anchor(Anchor::BottomRight)
.trigger(trigger)
Expand DownExpand Up@@ -158,7 +163,6 @@ impl Composer {
h_flex()
.w_full()
.px_2()
.pt_2()
.items_center()
.justify_between()
.text_size(px(13.))
Expand DownExpand Up@@ -199,16 +203,20 @@ impl Composer {

let store_content = self.workspace_store.clone();
let base_default = base_default.to_string();
let trigger = Button::new("workspace-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("workspace-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("workspace-popover")
.anchor(Anchor::BottomLeft)
.trigger(trigger)
Expand Down
3 changes: 3 additions & 0 deletions crates/ui/src/composer/components/pickers.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@ impl Composer {

let trigger = Button::new("model-picker")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand DownExpand Up@@ -286,6 +287,7 @@ impl Composer {

let trigger = Button::new("traits-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_chip())
Expand DownExpand Up@@ -406,6 +408,7 @@ impl Composer {

let trigger = Button::new("permission-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand Down
4 changes: 2 additions & 2 deletions crates/ui/src/composer/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1024,8 +1024,8 @@ impl Render for Composer {
.w_full()
.items_center()
.px(px(crate::chat::CONTENT_MIN_PADDING))
.pt_2()
.pb_3()
.pt_1()
.pb_2()
// Shift+Tab toggles Build ↔ Plan (S1 §4).
.on_key_down(cx.listener(|this, ev: &gpui::KeyDownEvent, _, cx| {
if ev.keystroke.key == "tab" && ev.keystroke.modifiers.shift {
Expand Down
23 changes: 14 additions & 9 deletions crates/ui/src/diff/view.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -828,15 +828,19 @@ impl DiffPanel {
let panel = cx.entity();
let session_selector = session.clone();

let trigger = Button::new("diff-turn-select").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("diff-turn-select")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);

let selector = Popover::new("diff-turn-popover")
.trigger(trigger)
Expand DownExpand Up@@ -1087,6 +1091,7 @@ impl DiffPanel {
let session_base = session.clone();
let trigger = Button::new("diff-base-select")
.ghost()
.outline()
.compact()
.label(current.clone())
.icon(IconName::ChevronDown);
Expand Down
5 changes: 3 additions & 2 deletions crates/ui/src/orchestrate_settings.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,10 +545,11 @@ impl OrchestrateSettingsPanel {
}
ChildApprovalMode::Manual => crate::tr!("orchestrate.child_approval.manual"),
};
// Ghost, not outline: a quiet resting trigger that only tints on hover,
// consistent with the General page dropdowns and the composer picker.
// A quiet resting trigger that only tints on hover, consistent with the
// General page dropdowns and the composer picker.
let trigger = Button::new("orchestrate-child-approval-dropdown")
.ghost()
.outline()
.compact()
.child(
h_flex()
Expand Down
2 changes: 2 additions & 0 deletions crates/ui/src/provider_card.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,6 +322,8 @@ impl ProviderCard {
let store = self.store.clone();

crate::material::overlay_popover("update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("update-available")
.ghost()
Expand Down
39 changes: 21 additions & 18 deletions crates/ui/src/provider_model_picker.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,27 @@ impl ProviderModelPicker {
});
let display = self.display_name(provider, model, profile_id, cx);
let glyph = tinted_glyph(&self.store, provider, profile_id, cx);
// Ghost, not outline: a quiet resting trigger (glyph + value +
// muted chevron) that only tints on hover, matching the
// composer's model picker. The "Add" variant stays an outlined
// action button.
Button::new(self.trigger_id).ghost().compact().child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
// A quiet resting trigger (glyph + value + muted chevron) that
// only tints on hover, matching the composer's model picker; the
// hairline marks it as a dropdown.
Button::new(self.trigger_id)
.ghost()
.outline()
.compact()
.child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions crates/ui/src/settings_page.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -825,6 +825,8 @@ impl SettingsPage {
let release_url = status.release_url.unwrap_or_default();

crate::material::overlay_popover("tcode-update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("tcode-update-available")
.ghost()
Expand DownExpand Up@@ -1555,11 +1557,10 @@ impl SettingsPage {
label: impl Into<SharedString>,
cx: &Context<Self>,
) -> Button {
// Ghost, not outline: transparent at rest (value + muted chevron) with a
// light tint only on hover — the same quiet trigger the composer's model
// picker uses. An outlined trigger reads as a card nested inside the
// already-bordered group.
Button::new(id).ghost().compact().child(
// Ghost fill (transparent at rest, light tint on hover) over a hairline
// outline — the same quiet trigger the composer's model picker uses, but
// bordered so it reads as a dropdown rather than plain text.
Button::new(id).ghost().outline().compact().child(
gpui_base::h_flex()
.w(px(160.))
.items_center()
Expand Down
5 changes: 4 additions & 1 deletion crates/ui/src/widgets/button.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,10 @@ impl RenderOnce for Button {
theme.success.opacity(0.3),
theme.success,
),
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, transparent),
// Transparent at rest; the hairline only shows with `.outline()`
// (border width is 0 otherwise), which is how select/dropdown
// triggers read as interactive controls.
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, theme.border),
ButtonVariant::Text => (
transparent,
theme.foreground.opacity(0.9),
Expand Down
3 changes: 1 addition & 2 deletions crates/ui/src/widgets/menu.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,6 @@ impl Render for PopupMenu {
.min_w(px(160.))
.max_w(px(420.))
.p_1()
.gap_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand All@@ -217,7 +216,7 @@ impl Render for PopupMenu {
for (index, item) in self.items.iter().enumerate() {
match item {
MenuItem::Separator => {
root = root.child(div().h(px(1.)).mx_1().bg(cx.theme().border))
root = root.child(div().h(px(1.)).mx_1().my_1().bg(cx.theme().border))
}
MenuItem::Item {
label,
Expand Down
2 changes: 1 addition & 1 deletion crates/ui/src/widgets/popover.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ impl RenderOnce for Popover {
.id("tcode-popover-content")
.occlude()
.when(appearance, |el| {
el.p_3()
el.p_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1810,7 +1810,7 @@ impl Render for ChatView {
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.flex_1()
.min_h_0()
.py_6();
.py_4();

let composer: AnyElement = if native_subagent_readonly {
div()
Expand Down
50 changes: 29 additions & 21 deletions crates/ui/src/composer/components/checkout.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ impl Composer {
let right: AnyElement = if turn_running {
Button::new("branch-picker")
.ghost()
.outline()
.compact()
.tooltip(crate::tr!("composer.wait_turn"))
.child(
Expand All@@ -39,16 +40,20 @@ impl Composer {
let store_open = self.workspace_store.clone();
let store_content = self.workspace_store.clone();
let current = picker_current.clone();
let trigger = Button::new("branch-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("branch-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("branch-popover")
.anchor(Anchor::BottomRight)
.trigger(trigger)
Expand DownExpand Up@@ -158,7 +163,6 @@ impl Composer {
h_flex()
.w_full()
.px_2()
.pt_2()
.items_center()
.justify_between()
.text_size(px(13.))
Expand DownExpand Up@@ -199,16 +203,20 @@ impl Composer {

let store_content = self.workspace_store.clone();
let base_default = base_default.to_string();
let trigger = Button::new("workspace-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("workspace-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("workspace-popover")
.anchor(Anchor::BottomLeft)
.trigger(trigger)
Expand Down
3 changes: 3 additions & 0 deletions crates/ui/src/composer/components/pickers.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@ impl Composer {

let trigger = Button::new("model-picker")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand DownExpand Up@@ -286,6 +287,7 @@ impl Composer {

let trigger = Button::new("traits-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_chip())
Expand DownExpand Up@@ -406,6 +408,7 @@ impl Composer {

let trigger = Button::new("permission-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand Down
4 changes: 2 additions & 2 deletions crates/ui/src/composer/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1024,8 +1024,8 @@ impl Render for Composer {
.w_full()
.items_center()
.px(px(crate::chat::CONTENT_MIN_PADDING))
.pt_2()
.pb_3()
.pt_1()
.pb_2()
// Shift+Tab toggles Build ↔ Plan (S1 §4).
.on_key_down(cx.listener(|this, ev: &gpui::KeyDownEvent, _, cx| {
if ev.keystroke.key == "tab" && ev.keystroke.modifiers.shift {
Expand Down
23 changes: 14 additions & 9 deletions crates/ui/src/diff/view.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -828,15 +828,19 @@ impl DiffPanel {
let panel = cx.entity();
let session_selector = session.clone();

let trigger = Button::new("diff-turn-select").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("diff-turn-select")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);

let selector = Popover::new("diff-turn-popover")
.trigger(trigger)
Expand DownExpand Up@@ -1087,6 +1091,7 @@ impl DiffPanel {
let session_base = session.clone();
let trigger = Button::new("diff-base-select")
.ghost()
.outline()
.compact()
.label(current.clone())
.icon(IconName::ChevronDown);
Expand Down
5 changes: 3 additions & 2 deletions crates/ui/src/orchestrate_settings.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,10 +545,11 @@ impl OrchestrateSettingsPanel {
}
ChildApprovalMode::Manual => crate::tr!("orchestrate.child_approval.manual"),
};
// Ghost, not outline: a quiet resting trigger that only tints on hover,
// consistent with the General page dropdowns and the composer picker.
// A quiet resting trigger that only tints on hover, consistent with the
// General page dropdowns and the composer picker.
let trigger = Button::new("orchestrate-child-approval-dropdown")
.ghost()
.outline()
.compact()
.child(
h_flex()
Expand Down
2 changes: 2 additions & 0 deletions crates/ui/src/provider_card.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,6 +322,8 @@ impl ProviderCard {
let store = self.store.clone();

crate::material::overlay_popover("update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("update-available")
.ghost()
Expand Down
39 changes: 21 additions & 18 deletions crates/ui/src/provider_model_picker.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,27 @@ impl ProviderModelPicker {
});
let display = self.display_name(provider, model, profile_id, cx);
let glyph = tinted_glyph(&self.store, provider, profile_id, cx);
// Ghost, not outline: a quiet resting trigger (glyph + value +
// muted chevron) that only tints on hover, matching the
// composer's model picker. The "Add" variant stays an outlined
// action button.
Button::new(self.trigger_id).ghost().compact().child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
// A quiet resting trigger (glyph + value + muted chevron) that
// only tints on hover, matching the composer's model picker; the
// hairline marks it as a dropdown.
Button::new(self.trigger_id)
.ghost()
.outline()
.compact()
.child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions crates/ui/src/settings_page.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -825,6 +825,8 @@ impl SettingsPage {
let release_url = status.release_url.unwrap_or_default();

crate::material::overlay_popover("tcode-update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("tcode-update-available")
.ghost()
Expand DownExpand Up@@ -1555,11 +1557,10 @@ impl SettingsPage {
label: impl Into<SharedString>,
cx: &Context<Self>,
) -> Button {
// Ghost, not outline: transparent at rest (value + muted chevron) with a
// light tint only on hover — the same quiet trigger the composer's model
// picker uses. An outlined trigger reads as a card nested inside the
// already-bordered group.
Button::new(id).ghost().compact().child(
// Ghost fill (transparent at rest, light tint on hover) over a hairline
// outline — the same quiet trigger the composer's model picker uses, but
// bordered so it reads as a dropdown rather than plain text.
Button::new(id).ghost().outline().compact().child(
gpui_base::h_flex()
.w(px(160.))
.items_center()
Expand Down
5 changes: 4 additions & 1 deletion crates/ui/src/widgets/button.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,10 @@ impl RenderOnce for Button {
theme.success.opacity(0.3),
theme.success,
),
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, transparent),
// Transparent at rest; the hairline only shows with `.outline()`
// (border width is 0 otherwise), which is how select/dropdown
// triggers read as interactive controls.
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, theme.border),
ButtonVariant::Text => (
transparent,
theme.foreground.opacity(0.9),
Expand Down
3 changes: 1 addition & 2 deletions crates/ui/src/widgets/menu.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,6 @@ impl Render for PopupMenu {
.min_w(px(160.))
.max_w(px(420.))
.p_1()
.gap_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand All@@ -217,7 +216,7 @@ impl Render for PopupMenu {
for (index, item) in self.items.iter().enumerate() {
match item {
MenuItem::Separator => {
root = root.child(div().h(px(1.)).mx_1().bg(cx.theme().border))
root = root.child(div().h(px(1.)).mx_1().my_1().bg(cx.theme().border))
}
MenuItem::Item {
label,
Expand Down
2 changes: 1 addition & 1 deletion crates/ui/src/widgets/popover.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ impl RenderOnce for Popover {
.id("tcode-popover-content")
.occlude()
.when(appearance, |el| {
el.p_3()
el.p_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1810,7 +1810,7 @@ impl Render for ChatView {
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.flex_1()
.min_h_0()
.py_6();
.py_4();

let composer: AnyElement = if native_subagent_readonly {
div()
Expand Down
50 changes: 29 additions & 21 deletions crates/ui/src/composer/components/checkout.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ impl Composer {
let right: AnyElement = if turn_running {
Button::new("branch-picker")
.ghost()
.outline()
.compact()
.tooltip(crate::tr!("composer.wait_turn"))
.child(
Expand All@@ -39,16 +40,20 @@ impl Composer {
let store_open = self.workspace_store.clone();
let store_content = self.workspace_store.clone();
let current = picker_current.clone();
let trigger = Button::new("branch-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("branch-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("branch-popover")
.anchor(Anchor::BottomRight)
.trigger(trigger)
Expand DownExpand Up@@ -158,7 +163,6 @@ impl Composer {
h_flex()
.w_full()
.px_2()
.pt_2()
.items_center()
.justify_between()
.text_size(px(13.))
Expand DownExpand Up@@ -199,16 +203,20 @@ impl Composer {

let store_content = self.workspace_store.clone();
let base_default = base_default.to_string();
let trigger = Button::new("workspace-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("workspace-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("workspace-popover")
.anchor(Anchor::BottomLeft)
.trigger(trigger)
Expand Down
3 changes: 3 additions & 0 deletions crates/ui/src/composer/components/pickers.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@ impl Composer {

let trigger = Button::new("model-picker")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand DownExpand Up@@ -286,6 +287,7 @@ impl Composer {

let trigger = Button::new("traits-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_chip())
Expand DownExpand Up@@ -406,6 +408,7 @@ impl Composer {

let trigger = Button::new("permission-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand Down
4 changes: 2 additions & 2 deletions crates/ui/src/composer/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1024,8 +1024,8 @@ impl Render for Composer {
.w_full()
.items_center()
.px(px(crate::chat::CONTENT_MIN_PADDING))
.pt_2()
.pb_3()
.pt_1()
.pb_2()
// Shift+Tab toggles Build ↔ Plan (S1 §4).
.on_key_down(cx.listener(|this, ev: &gpui::KeyDownEvent, _, cx| {
if ev.keystroke.key == "tab" && ev.keystroke.modifiers.shift {
Expand Down
23 changes: 14 additions & 9 deletions crates/ui/src/diff/view.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -828,15 +828,19 @@ impl DiffPanel {
let panel = cx.entity();
let session_selector = session.clone();

let trigger = Button::new("diff-turn-select").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("diff-turn-select")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);

let selector = Popover::new("diff-turn-popover")
.trigger(trigger)
Expand DownExpand Up@@ -1087,6 +1091,7 @@ impl DiffPanel {
let session_base = session.clone();
let trigger = Button::new("diff-base-select")
.ghost()
.outline()
.compact()
.label(current.clone())
.icon(IconName::ChevronDown);
Expand Down
5 changes: 3 additions & 2 deletions crates/ui/src/orchestrate_settings.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,10 +545,11 @@ impl OrchestrateSettingsPanel {
}
ChildApprovalMode::Manual => crate::tr!("orchestrate.child_approval.manual"),
};
// Ghost, not outline: a quiet resting trigger that only tints on hover,
// consistent with the General page dropdowns and the composer picker.
// A quiet resting trigger that only tints on hover, consistent with the
// General page dropdowns and the composer picker.
let trigger = Button::new("orchestrate-child-approval-dropdown")
.ghost()
.outline()
.compact()
.child(
h_flex()
Expand Down
2 changes: 2 additions & 0 deletions crates/ui/src/provider_card.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,6 +322,8 @@ impl ProviderCard {
let store = self.store.clone();

crate::material::overlay_popover("update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("update-available")
.ghost()
Expand Down
39 changes: 21 additions & 18 deletions crates/ui/src/provider_model_picker.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,27 @@ impl ProviderModelPicker {
});
let display = self.display_name(provider, model, profile_id, cx);
let glyph = tinted_glyph(&self.store, provider, profile_id, cx);
// Ghost, not outline: a quiet resting trigger (glyph + value +
// muted chevron) that only tints on hover, matching the
// composer's model picker. The "Add" variant stays an outlined
// action button.
Button::new(self.trigger_id).ghost().compact().child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
// A quiet resting trigger (glyph + value + muted chevron) that
// only tints on hover, matching the composer's model picker; the
// hairline marks it as a dropdown.
Button::new(self.trigger_id)
.ghost()
.outline()
.compact()
.child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions crates/ui/src/settings_page.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -825,6 +825,8 @@ impl SettingsPage {
let release_url = status.release_url.unwrap_or_default();

crate::material::overlay_popover("tcode-update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("tcode-update-available")
.ghost()
Expand DownExpand Up@@ -1555,11 +1557,10 @@ impl SettingsPage {
label: impl Into<SharedString>,
cx: &Context<Self>,
) -> Button {
// Ghost, not outline: transparent at rest (value + muted chevron) with a
// light tint only on hover — the same quiet trigger the composer's model
// picker uses. An outlined trigger reads as a card nested inside the
// already-bordered group.
Button::new(id).ghost().compact().child(
// Ghost fill (transparent at rest, light tint on hover) over a hairline
// outline — the same quiet trigger the composer's model picker uses, but
// bordered so it reads as a dropdown rather than plain text.
Button::new(id).ghost().outline().compact().child(
gpui_base::h_flex()
.w(px(160.))
.items_center()
Expand Down
5 changes: 4 additions & 1 deletion crates/ui/src/widgets/button.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,10 @@ impl RenderOnce for Button {
theme.success.opacity(0.3),
theme.success,
),
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, transparent),
// Transparent at rest; the hairline only shows with `.outline()`
// (border width is 0 otherwise), which is how select/dropdown
// triggers read as interactive controls.
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, theme.border),
ButtonVariant::Text => (
transparent,
theme.foreground.opacity(0.9),
Expand Down
3 changes: 1 addition & 2 deletions crates/ui/src/widgets/menu.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,6 @@ impl Render for PopupMenu {
.min_w(px(160.))
.max_w(px(420.))
.p_1()
.gap_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand All@@ -217,7 +216,7 @@ impl Render for PopupMenu {
for (index, item) in self.items.iter().enumerate() {
match item {
MenuItem::Separator => {
root = root.child(div().h(px(1.)).mx_1().bg(cx.theme().border))
root = root.child(div().h(px(1.)).mx_1().my_1().bg(cx.theme().border))
}
MenuItem::Item {
label,
Expand Down
2 changes: 1 addition & 1 deletion crates/ui/src/widgets/popover.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ impl RenderOnce for Popover {
.id("tcode-popover-content")
.occlude()
.when(appearance, |el| {
el.p_3()
el.p_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
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 crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1810,7 +1810,7 @@ impl Render for ChatView {
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.flex_1()
.min_h_0()
.py_6();
.py_4();

let composer: AnyElement = if native_subagent_readonly {
div()
Expand Down
50 changes: 29 additions & 21 deletions crates/ui/src/composer/components/checkout.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ impl Composer {
let right: AnyElement = if turn_running {
Button::new("branch-picker")
.ghost()
.outline()
.compact()
.tooltip(crate::tr!("composer.wait_turn"))
.child(
Expand All@@ -39,16 +40,20 @@ impl Composer {
let store_open = self.workspace_store.clone();
let store_content = self.workspace_store.clone();
let current = picker_current.clone();
let trigger = Button::new("branch-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("branch-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("branch-popover")
.anchor(Anchor::BottomRight)
.trigger(trigger)
Expand DownExpand Up@@ -158,7 +163,6 @@ impl Composer {
h_flex()
.w_full()
.px_2()
.pt_2()
.items_center()
.justify_between()
.text_size(px(13.))
Expand DownExpand Up@@ -199,16 +203,20 @@ impl Composer {

let store_content = self.workspace_store.clone();
let base_default = base_default.to_string();
let trigger = Button::new("workspace-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("workspace-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("workspace-popover")
.anchor(Anchor::BottomLeft)
.trigger(trigger)
Expand Down
3 changes: 3 additions & 0 deletions crates/ui/src/composer/components/pickers.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@ impl Composer {

let trigger = Button::new("model-picker")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand DownExpand Up@@ -286,6 +287,7 @@ impl Composer {

let trigger = Button::new("traits-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_chip())
Expand DownExpand Up@@ -406,6 +408,7 @@ impl Composer {

let trigger = Button::new("permission-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand Down
4 changes: 2 additions & 2 deletions crates/ui/src/composer/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1024,8 +1024,8 @@ impl Render for Composer {
.w_full()
.items_center()
.px(px(crate::chat::CONTENT_MIN_PADDING))
.pt_2()
.pb_3()
.pt_1()
.pb_2()
// Shift+Tab toggles Build ↔ Plan (S1 §4).
.on_key_down(cx.listener(|this, ev: &gpui::KeyDownEvent, _, cx| {
if ev.keystroke.key == "tab" && ev.keystroke.modifiers.shift {
Expand Down
23 changes: 14 additions & 9 deletions crates/ui/src/diff/view.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -828,15 +828,19 @@ impl DiffPanel {
let panel = cx.entity();
let session_selector = session.clone();

let trigger = Button::new("diff-turn-select").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("diff-turn-select")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);

let selector = Popover::new("diff-turn-popover")
.trigger(trigger)
Expand DownExpand Up@@ -1087,6 +1091,7 @@ impl DiffPanel {
let session_base = session.clone();
let trigger = Button::new("diff-base-select")
.ghost()
.outline()
.compact()
.label(current.clone())
.icon(IconName::ChevronDown);
Expand Down
5 changes: 3 additions & 2 deletions crates/ui/src/orchestrate_settings.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,10 +545,11 @@ impl OrchestrateSettingsPanel {
}
ChildApprovalMode::Manual => crate::tr!("orchestrate.child_approval.manual"),
};
// Ghost, not outline: a quiet resting trigger that only tints on hover,
// consistent with the General page dropdowns and the composer picker.
// A quiet resting trigger that only tints on hover, consistent with the
// General page dropdowns and the composer picker.
let trigger = Button::new("orchestrate-child-approval-dropdown")
.ghost()
.outline()
.compact()
.child(
h_flex()
Expand Down
2 changes: 2 additions & 0 deletions crates/ui/src/provider_card.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,6 +322,8 @@ impl ProviderCard {
let store = self.store.clone();

crate::material::overlay_popover("update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("update-available")
.ghost()
Expand Down
39 changes: 21 additions & 18 deletions crates/ui/src/provider_model_picker.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,27 @@ impl ProviderModelPicker {
});
let display = self.display_name(provider, model, profile_id, cx);
let glyph = tinted_glyph(&self.store, provider, profile_id, cx);
// Ghost, not outline: a quiet resting trigger (glyph + value +
// muted chevron) that only tints on hover, matching the
// composer's model picker. The "Add" variant stays an outlined
// action button.
Button::new(self.trigger_id).ghost().compact().child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
// A quiet resting trigger (glyph + value + muted chevron) that
// only tints on hover, matching the composer's model picker; the
// hairline marks it as a dropdown.
Button::new(self.trigger_id)
.ghost()
.outline()
.compact()
.child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions crates/ui/src/settings_page.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -825,6 +825,8 @@ impl SettingsPage {
let release_url = status.release_url.unwrap_or_default();

crate::material::overlay_popover("tcode-update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("tcode-update-available")
.ghost()
Expand DownExpand Up@@ -1555,11 +1557,10 @@ impl SettingsPage {
label: impl Into<SharedString>,
cx: &Context<Self>,
) -> Button {
// Ghost, not outline: transparent at rest (value + muted chevron) with a
// light tint only on hover — the same quiet trigger the composer's model
// picker uses. An outlined trigger reads as a card nested inside the
// already-bordered group.
Button::new(id).ghost().compact().child(
// Ghost fill (transparent at rest, light tint on hover) over a hairline
// outline — the same quiet trigger the composer's model picker uses, but
// bordered so it reads as a dropdown rather than plain text.
Button::new(id).ghost().outline().compact().child(
gpui_base::h_flex()
.w(px(160.))
.items_center()
Expand Down
5 changes: 4 additions & 1 deletion crates/ui/src/widgets/button.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,10 @@ impl RenderOnce for Button {
theme.success.opacity(0.3),
theme.success,
),
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, transparent),
// Transparent at rest; the hairline only shows with `.outline()`
// (border width is 0 otherwise), which is how select/dropdown
// triggers read as interactive controls.
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, theme.border),
ButtonVariant::Text => (
transparent,
theme.foreground.opacity(0.9),
Expand Down
3 changes: 1 addition & 2 deletions crates/ui/src/widgets/menu.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,6 @@ impl Render for PopupMenu {
.min_w(px(160.))
.max_w(px(420.))
.p_1()
.gap_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand All@@ -217,7 +216,7 @@ impl Render for PopupMenu {
for (index, item) in self.items.iter().enumerate() {
match item {
MenuItem::Separator => {
root = root.child(div().h(px(1.)).mx_1().bg(cx.theme().border))
root = root.child(div().h(px(1.)).mx_1().my_1().bg(cx.theme().border))
}
MenuItem::Item {
label,
Expand Down
2 changes: 1 addition & 1 deletion crates/ui/src/widgets/popover.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ impl RenderOnce for Popover {
.id("tcode-popover-content")
.occlude()
.when(appearance, |el| {
el.p_3()
el.p_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1810,7 +1810,7 @@ impl Render for ChatView {
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.flex_1()
.min_h_0()
.py_6();
.py_4();

let composer: AnyElement = if native_subagent_readonly {
div()
Expand Down
50 changes: 29 additions & 21 deletions crates/ui/src/composer/components/checkout.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ impl Composer {
let right: AnyElement = if turn_running {
Button::new("branch-picker")
.ghost()
.outline()
.compact()
.tooltip(crate::tr!("composer.wait_turn"))
.child(
Expand All@@ -39,16 +40,20 @@ impl Composer {
let store_open = self.workspace_store.clone();
let store_content = self.workspace_store.clone();
let current = picker_current.clone();
let trigger = Button::new("branch-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("branch-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("branch-popover")
.anchor(Anchor::BottomRight)
.trigger(trigger)
Expand DownExpand Up@@ -158,7 +163,6 @@ impl Composer {
h_flex()
.w_full()
.px_2()
.pt_2()
.items_center()
.justify_between()
.text_size(px(13.))
Expand DownExpand Up@@ -199,16 +203,20 @@ impl Composer {

let store_content = self.workspace_store.clone();
let base_default = base_default.to_string();
let trigger = Button::new("workspace-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("workspace-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("workspace-popover")
.anchor(Anchor::BottomLeft)
.trigger(trigger)
Expand Down
3 changes: 3 additions & 0 deletions crates/ui/src/composer/components/pickers.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@ impl Composer {

let trigger = Button::new("model-picker")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand DownExpand Up@@ -286,6 +287,7 @@ impl Composer {

let trigger = Button::new("traits-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_chip())
Expand DownExpand Up@@ -406,6 +408,7 @@ impl Composer {

let trigger = Button::new("permission-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand Down
4 changes: 2 additions & 2 deletions crates/ui/src/composer/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1024,8 +1024,8 @@ impl Render for Composer {
.w_full()
.items_center()
.px(px(crate::chat::CONTENT_MIN_PADDING))
.pt_2()
.pb_3()
.pt_1()
.pb_2()
// Shift+Tab toggles Build ↔ Plan (S1 §4).
.on_key_down(cx.listener(|this, ev: &gpui::KeyDownEvent, _, cx| {
if ev.keystroke.key == "tab" && ev.keystroke.modifiers.shift {
Expand Down
23 changes: 14 additions & 9 deletions crates/ui/src/diff/view.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -828,15 +828,19 @@ impl DiffPanel {
let panel = cx.entity();
let session_selector = session.clone();

let trigger = Button::new("diff-turn-select").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("diff-turn-select")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);

let selector = Popover::new("diff-turn-popover")
.trigger(trigger)
Expand DownExpand Up@@ -1087,6 +1091,7 @@ impl DiffPanel {
let session_base = session.clone();
let trigger = Button::new("diff-base-select")
.ghost()
.outline()
.compact()
.label(current.clone())
.icon(IconName::ChevronDown);
Expand Down
5 changes: 3 additions & 2 deletions crates/ui/src/orchestrate_settings.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,10 +545,11 @@ impl OrchestrateSettingsPanel {
}
ChildApprovalMode::Manual => crate::tr!("orchestrate.child_approval.manual"),
};
// Ghost, not outline: a quiet resting trigger that only tints on hover,
// consistent with the General page dropdowns and the composer picker.
// A quiet resting trigger that only tints on hover, consistent with the
// General page dropdowns and the composer picker.
let trigger = Button::new("orchestrate-child-approval-dropdown")
.ghost()
.outline()
.compact()
.child(
h_flex()
Expand Down
2 changes: 2 additions & 0 deletions crates/ui/src/provider_card.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,6 +322,8 @@ impl ProviderCard {
let store = self.store.clone();

crate::material::overlay_popover("update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("update-available")
.ghost()
Expand Down
39 changes: 21 additions & 18 deletions crates/ui/src/provider_model_picker.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,27 @@ impl ProviderModelPicker {
});
let display = self.display_name(provider, model, profile_id, cx);
let glyph = tinted_glyph(&self.store, provider, profile_id, cx);
// Ghost, not outline: a quiet resting trigger (glyph + value +
// muted chevron) that only tints on hover, matching the
// composer's model picker. The "Add" variant stays an outlined
// action button.
Button::new(self.trigger_id).ghost().compact().child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
// A quiet resting trigger (glyph + value + muted chevron) that
// only tints on hover, matching the composer's model picker; the
// hairline marks it as a dropdown.
Button::new(self.trigger_id)
.ghost()
.outline()
.compact()
.child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions crates/ui/src/settings_page.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -825,6 +825,8 @@ impl SettingsPage {
let release_url = status.release_url.unwrap_or_default();

crate::material::overlay_popover("tcode-update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("tcode-update-available")
.ghost()
Expand DownExpand Up@@ -1555,11 +1557,10 @@ impl SettingsPage {
label: impl Into<SharedString>,
cx: &Context<Self>,
) -> Button {
// Ghost, not outline: transparent at rest (value + muted chevron) with a
// light tint only on hover — the same quiet trigger the composer's model
// picker uses. An outlined trigger reads as a card nested inside the
// already-bordered group.
Button::new(id).ghost().compact().child(
// Ghost fill (transparent at rest, light tint on hover) over a hairline
// outline — the same quiet trigger the composer's model picker uses, but
// bordered so it reads as a dropdown rather than plain text.
Button::new(id).ghost().outline().compact().child(
gpui_base::h_flex()
.w(px(160.))
.items_center()
Expand Down
5 changes: 4 additions & 1 deletion crates/ui/src/widgets/button.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,10 @@ impl RenderOnce for Button {
theme.success.opacity(0.3),
theme.success,
),
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, transparent),
// Transparent at rest; the hairline only shows with `.outline()`
// (border width is 0 otherwise), which is how select/dropdown
// triggers read as interactive controls.
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, theme.border),
ButtonVariant::Text => (
transparent,
theme.foreground.opacity(0.9),
Expand Down
3 changes: 1 addition & 2 deletions crates/ui/src/widgets/menu.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,6 @@ impl Render for PopupMenu {
.min_w(px(160.))
.max_w(px(420.))
.p_1()
.gap_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand All@@ -217,7 +216,7 @@ impl Render for PopupMenu {
for (index, item) in self.items.iter().enumerate() {
match item {
MenuItem::Separator => {
root = root.child(div().h(px(1.)).mx_1().bg(cx.theme().border))
root = root.child(div().h(px(1.)).mx_1().my_1().bg(cx.theme().border))
}
MenuItem::Item {
label,
Expand Down
2 changes: 1 addition & 1 deletion crates/ui/src/widgets/popover.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ impl RenderOnce for Popover {
.id("tcode-popover-content")
.occlude()
.when(appearance, |el| {
el.p_3()
el.p_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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 crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1810,7 +1810,7 @@ impl Render for ChatView {
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.flex_1()
.min_h_0()
.py_6();
.py_4();

let composer: AnyElement = if native_subagent_readonly {
div()
Expand Down
50 changes: 29 additions & 21 deletions crates/ui/src/composer/components/checkout.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ impl Composer {
let right: AnyElement = if turn_running {
Button::new("branch-picker")
.ghost()
.outline()
.compact()
.tooltip(crate::tr!("composer.wait_turn"))
.child(
Expand All@@ -39,16 +40,20 @@ impl Composer {
let store_open = self.workspace_store.clone();
let store_content = self.workspace_store.clone();
let current = picker_current.clone();
let trigger = Button::new("branch-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("branch-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("branch-popover")
.anchor(Anchor::BottomRight)
.trigger(trigger)
Expand DownExpand Up@@ -158,7 +163,6 @@ impl Composer {
h_flex()
.w_full()
.px_2()
.pt_2()
.items_center()
.justify_between()
.text_size(px(13.))
Expand DownExpand Up@@ -199,16 +203,20 @@ impl Composer {

let store_content = self.workspace_store.clone();
let base_default = base_default.to_string();
let trigger = Button::new("workspace-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("workspace-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("workspace-popover")
.anchor(Anchor::BottomLeft)
.trigger(trigger)
Expand Down
3 changes: 3 additions & 0 deletions crates/ui/src/composer/components/pickers.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@ impl Composer {

let trigger = Button::new("model-picker")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand DownExpand Up@@ -286,6 +287,7 @@ impl Composer {

let trigger = Button::new("traits-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_chip())
Expand DownExpand Up@@ -406,6 +408,7 @@ impl Composer {

let trigger = Button::new("permission-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand Down
4 changes: 2 additions & 2 deletions crates/ui/src/composer/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1024,8 +1024,8 @@ impl Render for Composer {
.w_full()
.items_center()
.px(px(crate::chat::CONTENT_MIN_PADDING))
.pt_2()
.pb_3()
.pt_1()
.pb_2()
// Shift+Tab toggles Build ↔ Plan (S1 §4).
.on_key_down(cx.listener(|this, ev: &gpui::KeyDownEvent, _, cx| {
if ev.keystroke.key == "tab" && ev.keystroke.modifiers.shift {
Expand Down
23 changes: 14 additions & 9 deletions crates/ui/src/diff/view.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -828,15 +828,19 @@ impl DiffPanel {
let panel = cx.entity();
let session_selector = session.clone();

let trigger = Button::new("diff-turn-select").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("diff-turn-select")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);

let selector = Popover::new("diff-turn-popover")
.trigger(trigger)
Expand DownExpand Up@@ -1087,6 +1091,7 @@ impl DiffPanel {
let session_base = session.clone();
let trigger = Button::new("diff-base-select")
.ghost()
.outline()
.compact()
.label(current.clone())
.icon(IconName::ChevronDown);
Expand Down
5 changes: 3 additions & 2 deletions crates/ui/src/orchestrate_settings.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,10 +545,11 @@ impl OrchestrateSettingsPanel {
}
ChildApprovalMode::Manual => crate::tr!("orchestrate.child_approval.manual"),
};
// Ghost, not outline: a quiet resting trigger that only tints on hover,
// consistent with the General page dropdowns and the composer picker.
// A quiet resting trigger that only tints on hover, consistent with the
// General page dropdowns and the composer picker.
let trigger = Button::new("orchestrate-child-approval-dropdown")
.ghost()
.outline()
.compact()
.child(
h_flex()
Expand Down
2 changes: 2 additions & 0 deletions crates/ui/src/provider_card.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,6 +322,8 @@ impl ProviderCard {
let store = self.store.clone();

crate::material::overlay_popover("update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("update-available")
.ghost()
Expand Down
39 changes: 21 additions & 18 deletions crates/ui/src/provider_model_picker.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,27 @@ impl ProviderModelPicker {
});
let display = self.display_name(provider, model, profile_id, cx);
let glyph = tinted_glyph(&self.store, provider, profile_id, cx);
// Ghost, not outline: a quiet resting trigger (glyph + value +
// muted chevron) that only tints on hover, matching the
// composer's model picker. The "Add" variant stays an outlined
// action button.
Button::new(self.trigger_id).ghost().compact().child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
// A quiet resting trigger (glyph + value + muted chevron) that
// only tints on hover, matching the composer's model picker; the
// hairline marks it as a dropdown.
Button::new(self.trigger_id)
.ghost()
.outline()
.compact()
.child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions crates/ui/src/settings_page.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -825,6 +825,8 @@ impl SettingsPage {
let release_url = status.release_url.unwrap_or_default();

crate::material::overlay_popover("tcode-update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("tcode-update-available")
.ghost()
Expand DownExpand Up@@ -1555,11 +1557,10 @@ impl SettingsPage {
label: impl Into<SharedString>,
cx: &Context<Self>,
) -> Button {
// Ghost, not outline: transparent at rest (value + muted chevron) with a
// light tint only on hover — the same quiet trigger the composer's model
// picker uses. An outlined trigger reads as a card nested inside the
// already-bordered group.
Button::new(id).ghost().compact().child(
// Ghost fill (transparent at rest, light tint on hover) over a hairline
// outline — the same quiet trigger the composer's model picker uses, but
// bordered so it reads as a dropdown rather than plain text.
Button::new(id).ghost().outline().compact().child(
gpui_base::h_flex()
.w(px(160.))
.items_center()
Expand Down
5 changes: 4 additions & 1 deletion crates/ui/src/widgets/button.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,10 @@ impl RenderOnce for Button {
theme.success.opacity(0.3),
theme.success,
),
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, transparent),
// Transparent at rest; the hairline only shows with `.outline()`
// (border width is 0 otherwise), which is how select/dropdown
// triggers read as interactive controls.
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, theme.border),
ButtonVariant::Text => (
transparent,
theme.foreground.opacity(0.9),
Expand Down
3 changes: 1 addition & 2 deletions crates/ui/src/widgets/menu.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,6 @@ impl Render for PopupMenu {
.min_w(px(160.))
.max_w(px(420.))
.p_1()
.gap_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand All@@ -217,7 +216,7 @@ impl Render for PopupMenu {
for (index, item) in self.items.iter().enumerate() {
match item {
MenuItem::Separator => {
root = root.child(div().h(px(1.)).mx_1().bg(cx.theme().border))
root = root.child(div().h(px(1.)).mx_1().my_1().bg(cx.theme().border))
}
MenuItem::Item {
label,
Expand Down
2 changes: 1 addition & 1 deletion crates/ui/src/widgets/popover.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ impl RenderOnce for Popover {
.id("tcode-popover-content")
.occlude()
.when(appearance, |el| {
el.p_3()
el.p_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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 crates/ui/src/chat/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1810,7 +1810,7 @@ impl Render for ChatView {
.with_sizing_behavior(gpui::ListSizingBehavior::Auto)
.flex_1()
.min_h_0()
.py_6();
.py_4();

let composer: AnyElement = if native_subagent_readonly {
div()
Expand Down
50 changes: 29 additions & 21 deletions crates/ui/src/composer/components/checkout.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ impl Composer {
let right: AnyElement = if turn_running {
Button::new("branch-picker")
.ghost()
.outline()
.compact()
.tooltip(crate::tr!("composer.wait_turn"))
.child(
Expand All@@ -39,16 +40,20 @@ impl Composer {
let store_open = self.workspace_store.clone();
let store_content = self.workspace_store.clone();
let current = picker_current.clone();
let trigger = Button::new("branch-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("branch-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/git-branch.svg").xsmall())
.child(picker_current.clone())
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("branch-popover")
.anchor(Anchor::BottomRight)
.trigger(trigger)
Expand DownExpand Up@@ -158,7 +163,6 @@ impl Composer {
h_flex()
.w_full()
.px_2()
.pt_2()
.items_center()
.justify_between()
.text_size(px(13.))
Expand DownExpand Up@@ -199,16 +203,20 @@ impl Composer {

let store_content = self.workspace_store.clone();
let base_default = base_default.to_string();
let trigger = Button::new("workspace-picker").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("workspace-picker")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.text_color(muted)
.child(Icon::empty().path("icons/folder-closed.svg").xsmall())
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
crate::material::overlay_popover("workspace-popover")
.anchor(Anchor::BottomLeft)
.trigger(trigger)
Expand Down
3 changes: 3 additions & 0 deletions crates/ui/src/composer/components/pickers.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,6 +200,7 @@ impl Composer {

let trigger = Button::new("model-picker")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand DownExpand Up@@ -286,6 +287,7 @@ impl Composer {

let trigger = Button::new("traits-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_chip())
Expand DownExpand Up@@ -406,6 +408,7 @@ impl Composer {

let trigger = Button::new("permission-chip")
.ghost()
.outline()
.compact()
.h(px(28.))
.rounded(crate::material::radius_input())
Expand Down
4 changes: 2 additions & 2 deletions crates/ui/src/composer/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1024,8 +1024,8 @@ impl Render for Composer {
.w_full()
.items_center()
.px(px(crate::chat::CONTENT_MIN_PADDING))
.pt_2()
.pb_3()
.pt_1()
.pb_2()
// Shift+Tab toggles Build ↔ Plan (S1 §4).
.on_key_down(cx.listener(|this, ev: &gpui::KeyDownEvent, _, cx| {
if ev.keystroke.key == "tab" && ev.keystroke.modifiers.shift {
Expand Down
23 changes: 14 additions & 9 deletions crates/ui/src/diff/view.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -828,15 +828,19 @@ impl DiffPanel {
let panel = cx.entity();
let session_selector = session.clone();

let trigger = Button::new("diff-turn-select").ghost().compact().child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);
let trigger = Button::new("diff-turn-select")
.ghost()
.outline()
.compact()
.child(
h_flex()
.gap_1p5()
.items_center()
.text_size(px(13.))
.font_medium()
.child(label)
.child(Icon::new(IconName::ChevronDown).xsmall().text_color(muted)),
);

let selector = Popover::new("diff-turn-popover")
.trigger(trigger)
Expand DownExpand Up@@ -1087,6 +1091,7 @@ impl DiffPanel {
let session_base = session.clone();
let trigger = Button::new("diff-base-select")
.ghost()
.outline()
.compact()
.label(current.clone())
.icon(IconName::ChevronDown);
Expand Down
5 changes: 3 additions & 2 deletions crates/ui/src/orchestrate_settings.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -545,10 +545,11 @@ impl OrchestrateSettingsPanel {
}
ChildApprovalMode::Manual => crate::tr!("orchestrate.child_approval.manual"),
};
// Ghost, not outline: a quiet resting trigger that only tints on hover,
// consistent with the General page dropdowns and the composer picker.
// A quiet resting trigger that only tints on hover, consistent with the
// General page dropdowns and the composer picker.
let trigger = Button::new("orchestrate-child-approval-dropdown")
.ghost()
.outline()
.compact()
.child(
h_flex()
Expand Down
2 changes: 2 additions & 0 deletions crates/ui/src/provider_card.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -322,6 +322,8 @@ impl ProviderCard {
let store = self.store.clone();

crate::material::overlay_popover("update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("update-available")
.ghost()
Expand Down
39 changes: 21 additions & 18 deletions crates/ui/src/provider_model_picker.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,24 +192,27 @@ impl ProviderModelPicker {
});
let display = self.display_name(provider, model, profile_id, cx);
let glyph = tinted_glyph(&self.store, provider, profile_id, cx);
// Ghost, not outline: a quiet resting trigger (glyph + value +
// muted chevron) that only tints on hover, matching the
// composer's model picker. The "Add" variant stays an outlined
// action button.
Button::new(self.trigger_id).ghost().compact().child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
// A quiet resting trigger (glyph + value + muted chevron) that
// only tints on hover, matching the composer's model picker; the
// hairline marks it as a dropdown.
Button::new(self.trigger_id)
.ghost()
.outline()
.compact()
.child(
h_flex()
.w(px(230.))
.items_center()
.gap_2()
.text_size(px(13.))
.child(glyph.small())
.child(div().flex_1().min_w_0().child(display))
.child(
Icon::new(IconName::ChevronDown)
.xsmall()
.text_color(cx.theme().muted_foreground),
),
)
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions crates/ui/src/settings_page.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -825,6 +825,8 @@ impl SettingsPage {
let release_url = status.release_url.unwrap_or_default();

crate::material::overlay_popover("tcode-update-popover")
// Prose card, not a menu: keep the roomier panel padding.
.p_3()
.trigger(
Button::new("tcode-update-available")
.ghost()
Expand DownExpand Up@@ -1555,11 +1557,10 @@ impl SettingsPage {
label: impl Into<SharedString>,
cx: &Context<Self>,
) -> Button {
// Ghost, not outline: transparent at rest (value + muted chevron) with a
// light tint only on hover — the same quiet trigger the composer's model
// picker uses. An outlined trigger reads as a card nested inside the
// already-bordered group.
Button::new(id).ghost().compact().child(
// Ghost fill (transparent at rest, light tint on hover) over a hairline
// outline — the same quiet trigger the composer's model picker uses, but
// bordered so it reads as a dropdown rather than plain text.
Button::new(id).ghost().outline().compact().child(
gpui_base::h_flex()
.w(px(160.))
.items_center()
Expand Down
5 changes: 4 additions & 1 deletion crates/ui/src/widgets/button.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,10 @@ impl RenderOnce for Button {
theme.success.opacity(0.3),
theme.success,
),
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, transparent),
// Transparent at rest; the hairline only shows with `.outline()`
// (border width is 0 otherwise), which is how select/dropdown
// triggers read as interactive controls.
ButtonVariant::Ghost => (transparent, theme.foreground, theme.muted, theme.border),
ButtonVariant::Text => (
transparent,
theme.foreground.opacity(0.9),
Expand Down
3 changes: 1 addition & 2 deletions crates/ui/src/widgets/menu.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,7 +207,6 @@ impl Render for PopupMenu {
.min_w(px(160.))
.max_w(px(420.))
.p_1()
.gap_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand All@@ -217,7 +216,7 @@ impl Render for PopupMenu {
for (index, item) in self.items.iter().enumerate() {
match item {
MenuItem::Separator => {
root = root.child(div().h(px(1.)).mx_1().bg(cx.theme().border))
root = root.child(div().h(px(1.)).mx_1().my_1().bg(cx.theme().border))
}
MenuItem::Item {
label,
Expand Down
2 changes: 1 addition & 1 deletion crates/ui/src/widgets/popover.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,7 +139,7 @@ impl RenderOnce for Popover {
.id("tcode-popover-content")
.occlude()
.when(appearance, |el| {
el.p_3()
el.p_1()
.rounded(crate::material::radius_overlay())
.bg(cx.theme().popover)
.border_1()
Expand Down