zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-02 19:31:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add conflict styles to project panel

Browse Source
This commit is contained in:
Mikayla Maki 2023-05-22 10:09:55 -07:00
parent af73c1af06
commit a355b4c135
No known key found for this signature in database
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/theme/src/theme.rs
View File

@ -458,6 +458,7 @@ pub struct EntryStatus {
pub struct GitProjectStatus {
pub modified: Color,
pub inserted: Color,
pub conflict: Color,
}
#[derive(Clone, Debug, Deserialize, Default)]

3
styles/src/styleTree/projectPanel.ts
View File

@ -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(),
}
}