From a355b4c135c1c9f656bc3c3fa3057a052ffea196 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Mon, 22 May 2023 10:09:55 -0700
Subject: [PATCH] Add conflict styles to project panel

---
 crates/theme/src/theme.rs            | 1 +
 styles/src/styleTree/projectPanel.ts | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index c589137e73..b5ac126a69 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -458,6 +458,7 @@ pub struct EntryStatus {
 pub struct GitProjectStatus {
     pub modified: Color,
     pub inserted: Color,
+    pub conflict: Color,
 }
 
 #[derive(Clone, Debug, Deserialize, Default)]
diff --git a/styles/src/styleTree/projectPanel.ts b/styles/src/styleTree/projectPanel.ts
index 976cdede5c..81dded151e 100644
--- a/styles/src/styleTree/projectPanel.ts
+++ b/styles/src/styleTree/projectPanel.ts
@@ -21,6 +21,9 @@ export default function projectPanel(colorScheme: ColorScheme) {
             inserted: isLight
                 ? colorScheme.ramps.green(0.4).hex()
                 : colorScheme.ramps.green(0.5).hex(),
+            conflict: isLight
+                    ? colorScheme.ramps.red(0.4).hex()
+                    : colorScheme.ramps.red(0.5).hex(),
         }
     }