From 97d187bba7a33ccecf708287987e8b69bcca9f9d Mon Sep 17 00:00:00 2001
From: Nate Butler <iamnbutler@gmail.com>
Date: Tue, 29 Aug 2023 19:50:27 -0400
Subject: [PATCH] Remove project divider in titlebar

---
 crates/collab_ui/src/collab_titlebar_item.rs |  8 ----
 styles/src/component/index.ts                |  6 +++
 styles/src/component/text_button.ts          | 44 ++++++++++----------
 styles/src/element/index.ts                  |  2 +
 styles/src/{component => element}/margin.ts  |  0
 styles/src/{component => element}/padding.ts |  0
 styles/src/style_tree/titlebar.ts            | 12 ++----
 styles/src/theme/index.ts                    |  1 +
 8 files changed, 35 insertions(+), 38 deletions(-)
 create mode 100644 styles/src/component/index.ts
 rename styles/src/{component => element}/margin.ts (100%)
 rename styles/src/{component => element}/padding.ts (100%)

diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 684ddca08d..bd94c85f95 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -213,7 +213,6 @@ impl CollabTitlebarItem {
             .map(|branch| util::truncate_and_trailoff(&branch, MAX_BRANCH_NAME_LENGTH));
         let project_style = theme.titlebar.project_menu_button.clone();
         let git_style = theme.titlebar.git_menu_button.clone();
-        let divider_style = theme.titlebar.project_name_divider.clone();
         let item_spacing = theme.titlebar.item_spacing;
 
         let mut ret = Flex::row().with_child(
@@ -249,13 +248,6 @@ impl CollabTitlebarItem {
         if let Some(git_branch) = branch_prepended {
             ret = ret.with_child(
                 Flex::row()
-                    .with_child(
-                        Label::new("/", divider_style.text)
-                            .contained()
-                            .with_style(divider_style.container)
-                            .aligned()
-                            .left(),
-                    )
                     .with_child(
                         Stack::new()
                             .with_child(
diff --git a/styles/src/component/index.ts b/styles/src/component/index.ts
new file mode 100644
index 0000000000..f2cbc7b26a
--- /dev/null
+++ b/styles/src/component/index.ts
@@ -0,0 +1,6 @@
+export * from "./icon_button"
+export * from "./indicator"
+export * from "./input"
+export * from "./tab"
+export * from "./tab_bar_button"
+export * from "./text_button"
diff --git a/styles/src/component/text_button.ts b/styles/src/component/text_button.ts
index b73d20ff1a..8333d9e81a 100644
--- a/styles/src/component/text_button.ts
+++ b/styles/src/component/text_button.ts
@@ -74,31 +74,31 @@ export function text_button({
             hovered: disabled
                 ? {}
                 : {
-                      background: background(
-                          layer ?? theme.lowest,
-                          color,
-                          "hovered"
-                      ),
-                      color: foreground(
-                          layer ?? theme.lowest,
-                          color,
-                          "hovered"
-                      ),
-                  },
+                    background: background(
+                        layer ?? theme.lowest,
+                        color,
+                        "hovered"
+                    ),
+                    color: foreground(
+                        layer ?? theme.lowest,
+                        color,
+                        "hovered"
+                    ),
+                },
             clicked: disabled
                 ? {}
                 : {
-                      background: background(
-                          layer ?? theme.lowest,
-                          color,
-                          "pressed"
-                      ),
-                      color: foreground(
-                          layer ?? theme.lowest,
-                          color,
-                          "pressed"
-                      ),
-                  },
+                    background: background(
+                        layer ?? theme.lowest,
+                        color,
+                        "pressed"
+                    ),
+                    color: foreground(
+                        layer ?? theme.lowest,
+                        color,
+                        "pressed"
+                    ),
+                },
         },
     })
 }
diff --git a/styles/src/element/index.ts b/styles/src/element/index.ts
index d41b4e2cc3..0586399fb1 100644
--- a/styles/src/element/index.ts
+++ b/styles/src/element/index.ts
@@ -1,4 +1,6 @@
 import { interactive, Interactive } from "./interactive"
 import { toggleable, Toggleable } from "./toggle"
 
+export * from "./padding"
+export * from "./margin"
 export { interactive, Interactive, toggleable, Toggleable }
diff --git a/styles/src/component/margin.ts b/styles/src/element/margin.ts
similarity index 100%
rename from styles/src/component/margin.ts
rename to styles/src/element/margin.ts
diff --git a/styles/src/component/padding.ts b/styles/src/element/padding.ts
similarity index 100%
rename from styles/src/component/padding.ts
rename to styles/src/element/padding.ts
diff --git a/styles/src/style_tree/titlebar.ts b/styles/src/style_tree/titlebar.ts
index 9fb439f618..672907b22c 100644
--- a/styles/src/style_tree/titlebar.ts
+++ b/styles/src/style_tree/titlebar.ts
@@ -1,8 +1,6 @@
-import { icon_button, toggleable_icon_button } from "../component/icon_button"
-import { toggleable_text_button } from "../component/text_button"
+import { icon_button, toggleable_icon_button, toggleable_text_button } from "../component"
 import { interactive, toggleable } from "../element"
-import { useTheme } from "../theme"
-import { with_opacity } from "../theme/color"
+import { useTheme, with_opacity } from "../theme"
 import { background, border, foreground, text } from "./components"
 
 const ITEM_SPACING = 8
@@ -185,12 +183,10 @@ export function titlebar(): any {
             height: 400,
         },
 
-        // Project
-        project_name_divider: text(theme.lowest, "sans", "variant"),
-
         project_menu_button: toggleable_text_button(theme, {
-            color: "base",
+            color: "base"
         }),
+
         git_menu_button: toggleable_text_button(theme, {
             color: "variant",
         }),
diff --git a/styles/src/theme/index.ts b/styles/src/theme/index.ts
index ca8aaa461f..47110940f5 100644
--- a/styles/src/theme/index.ts
+++ b/styles/src/theme/index.ts
@@ -23,3 +23,4 @@ export * from "./create_theme"
 export * from "./ramps"
 export * from "./syntax"
 export * from "./theme_config"
+export * from "./color"