Continue refining theme, update tabs & tab bar

crates/theme2/src/colors.rs

@@ -64,6 +64,7 @@ pub struct ThemeColors {
     pub element_selected: Hsla,
     pub element_disabled: Hsla,
     pub element_placeholder: Hsla,
+    pub element_drop_target: Hsla,
     pub ghost_element: Hsla,
     pub ghost_element_hover: Hsla,
     pub ghost_element_active: Hsla,
@@ -83,6 +84,8 @@ pub struct ThemeColors {
     pub title_bar: Hsla,
     pub toolbar: Hsla,
     pub tab_bar: Hsla,
+    pub tab_inactive: Hsla,
+    pub tab_active: Hsla,
     pub editor: Hsla,
     pub editor_subheader: Hsla,
     pub editor_active_line: Hsla,

crates/theme2/src/default_colors.rs

@@ -25,7 +25,7 @@ impl Default for StatusColors {
     fn default() -> Self {
         Self {
             conflict: red().dark(11).into(),
-            created: green().dark(11).into(),
+            created: grass().dark(11).into(),
             deleted: red().dark(11).into(),
             error: red().dark(11).into(),
             hidden: neutral().dark(11).into(),
@@ -33,7 +33,7 @@ impl Default for StatusColors {
             info: blue().dark(11).into(),
             modified: yellow().dark(11).into(),
             renamed: blue().dark(11).into(),
-            success: green().dark(11).into(),
+            success: grass().dark(11).into(),
             warning: yellow().dark(11).into(),
         }
     }
@@ -43,9 +43,9 @@ impl Default for GitStatusColors {
     fn default() -> Self {
         Self {
             conflict: orange().dark(11),
-            created: green().dark(11),
+            created: grass().dark(11),
             deleted: red().dark(11),
-            ignored: green().dark(11),
+            ignored: neutral().dark(11),
             modified: yellow().dark(11),
             renamed: blue().dark(11),
         }
@@ -209,6 +209,7 @@ impl ThemeColors {
             element_selected: neutral().light(5).into(),
             element_disabled: neutral().light_alpha(3).into(),
             element_placeholder: neutral().light(11).into(),
+            element_drop_target: blue().light_alpha(2).into(),
             ghost_element: system.transparent,
             ghost_element_hover: neutral().light(4).into(),
             ghost_element_active: neutral().light(5).into(),
@@ -218,16 +219,18 @@ impl ThemeColors {
             text_muted: neutral().light(11).into(),
             text_placeholder: neutral().light(11).into(),
             text_disabled: neutral().light(10).into(),
-            text_accent: blue().light(12).into(),
-            icon: neutral().light(12).into(),
-            icon_muted: neutral().light(11).into(),
-            icon_disabled: neutral().light(10).into(),
-            icon_placeholder: neutral().light(11).into(),
-            icon_accent: blue().light(12).into(),
+            text_accent: blue().light(11).into(),
+            icon: neutral().light(11).into(),
+            icon_muted: neutral().light(10).into(),
+            icon_disabled: neutral().light(9).into(),
+            icon_placeholder: neutral().light(10).into(),
+            icon_accent: blue().light(11).into(),
             status_bar: neutral().light(2).into(),
             title_bar: neutral().light(2).into(),
-            toolbar: neutral().light(2).into(),
+            toolbar: neutral().light(1).into(),
             tab_bar: neutral().light(2).into(),
+            tab_active: neutral().light(1).into(),
+            tab_inactive: neutral().light(2).into(),
             editor: neutral().light(1).into(),
             editor_subheader: neutral().light(2).into(),
             editor_active_line: neutral().light_alpha(3).into(),
@@ -251,6 +254,7 @@ impl ThemeColors {
             element_selected: neutral().dark(5).into(),
             element_disabled: neutral().dark_alpha(3).into(),
             element_placeholder: neutral().dark(11).into(),
+            element_drop_target: blue().dark_alpha(2).into(),
             ghost_element: system.transparent,
             ghost_element_hover: neutral().dark(4).into(),
             ghost_element_active: neutral().dark(5).into(),
@@ -260,16 +264,18 @@ impl ThemeColors {
             text_muted: neutral().dark(11).into(),
             text_placeholder: neutral().dark(11).into(),
             text_disabled: neutral().dark(10).into(),
-            text_accent: blue().dark(12).into(),
-            icon: neutral().dark(12).into(),
-            icon_muted: neutral().dark(11).into(),
-            icon_disabled: neutral().dark(10).into(),
-            icon_placeholder: neutral().dark(11).into(),
-            icon_accent: blue().dark(12).into(),
+            text_accent: blue().dark(11).into(),
+            icon: neutral().dark(11).into(),
+            icon_muted: neutral().dark(10).into(),
+            icon_disabled: neutral().dark(9).into(),
+            icon_placeholder: neutral().dark(10).into(),
+            icon_accent: blue().dark(11).into(),
             status_bar: neutral().dark(2).into(),
             title_bar: neutral().dark(2).into(),
-            toolbar: neutral().dark(2).into(),
+            toolbar: neutral().dark(1).into(),
             tab_bar: neutral().dark(2).into(),
+            tab_active: neutral().dark(1).into(),
+            tab_inactive: neutral().dark(2).into(),
             editor: neutral().dark(1).into(),
             editor_subheader: neutral().dark(2).into(),
             editor_active_line: neutral().dark_alpha(3).into(),