Merge branch 'main' into editor2-rendering

2023-11-06 11:06:43 -07:00 · 2023-11-06 11:06:43 -07:00 · c59817cd72
commit c59817cd72
parent d88dccffbc 254b369624
90 changed files with 4097 additions and 1476 deletions
--- a/crates/workspace2/src/status_bar.rs
+++ b/crates/workspace2/src/status_bar.rs
@ -45,7 +45,7 @@ impl Render for StatusBar {
            .justify_between()
            .w_full()
            .h_8()
-            .bg(cx.theme().colors().status_bar)
+            .bg(cx.theme().colors().status_bar_background)
            .child(self.render_left_tools(cx))
            .child(self.render_right_tools(cx))
    }