Merge branch 'main' into zed2-breadcrumbs

2023-12-01 12:24:23 -05:00 · 2023-12-01 12:24:23 -05:00 · 6f9e08ceea
commit 6f9e08ceea
parent 910aeb4f56 85d72f63c1
10 changed files with 746 additions and 326 deletions
--- a/crates/workspace2/src/workspace2.rs
+++ b/crates/workspace2/src/workspace2.rs
@ -3638,6 +3638,8 @@ impl Render for Workspace {
            .items_start()
            .text_color(cx.theme().colors().text)
            .bg(cx.theme().colors().background)
+            .border()
+            .border_color(cx.theme().colors().border)
            .children(self.titlebar_item.clone())
            .child(
                div()