Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove red borders, improve left side padding

Browse source
This commit is contained in:
Nate Butler 2023-12-15 11:07:40 -05:00
parent 50a44dd8ba
commit 47eaf1abd8
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/collab_ui2/src/collab_titlebar_item.rs
View file

@ -74,12 +74,16 @@ impl Render for CollabTitlebarItem {
// Set a non-scaling min-height here to ensure the titlebar is // Set a non-scaling min-height here to ensure the titlebar is
// always at least the height of the traffic lights. // always at least the height of the traffic lights.
.min_h(px(32.)) .min_h(px(32.))
.when( .pl_2()
!matches!(cx.window_bounds(), WindowBounds::Fullscreen), .map(|this| {
// Use pixels here instead of a rem-based size because the macOS traffic if matches!(cx.window_bounds(), WindowBounds::Fullscreen) {
// lights are a static size, and don't scale with the rest of the UI. this.pl_2()
|s| s.pl(px(68.)), } else {
) // Use pixels here instead of a rem-based size because the macOS traffic
// lights are a static size, and don't scale with the rest of the UI.
this.pl(px(72.))
}
})
.bg(cx.theme().colors().title_bar_background) .bg(cx.theme().colors().title_bar_background)
.on_click(|event, cx| { .on_click(|event, cx| {
if event.up.click_count == 2 { if event.up.click_count == 2 {
@ -325,8 +329,6 @@ impl CollabTitlebarItem {
let name = util::truncate_and_trailoff(name, MAX_PROJECT_NAME_LENGTH); let name = util::truncate_and_trailoff(name, MAX_PROJECT_NAME_LENGTH);
div() div()
.border()
.border_color(gpui::red())
.child( .child(
Button::new("project_name_trigger", name) Button::new("project_name_trigger", name)
.style(ButtonStyle::Subtle) .style(ButtonStyle::Subtle)
@ -365,10 +367,9 @@ impl CollabTitlebarItem {
Some( Some(
div() div()
.border()
.border_color(gpui::red())
.child( .child(
Button::new("project_branch_trigger", branch_name) Button::new("project_branch_trigger", branch_name)
.color(Color::Muted)
.style(ButtonStyle::Subtle) .style(ButtonStyle::Subtle)
.tooltip(move |cx| { .tooltip(move |cx| {
Tooltip::with_meta( Tooltip::with_meta(