diff --git a/assets/themes/andromeda/andromeda.json b/assets/themes/andromeda/andromeda.json index 9eabd85cee..389b0269a1 100644 --- a/assets/themes/andromeda/andromeda.json +++ b/assets/themes/andromeda/andromeda.json @@ -111,7 +111,7 @@ "hint": "#618399ff", "hint.background": "#12231fff", "hint.border": "#183934ff", - "ignored": "#aca8aeff", + "ignored": "#6b6b73ff", "ignored.background": "#262933ff", "ignored.border": "#2b2f38ff", "info": "#10a793ff", diff --git a/assets/themes/atelier/atelier.json b/assets/themes/atelier/atelier.json index 55195bbf80..d8fae1d30d 100644 --- a/assets/themes/atelier/atelier.json +++ b/assets/themes/atelier/atelier.json @@ -111,7 +111,7 @@ "hint": "#706897ff", "hint.background": "#161a35ff", "hint.border": "#222953ff", - "ignored": "#898591ff", + "ignored": "#756f7eff", "ignored.background": "#3a353fff", "ignored.border": "#56505eff", "info": "#566ddaff", @@ -495,7 +495,7 @@ "hint": "#776d9dff", "hint.background": "#e1e0f9ff", "hint.border": "#c8c7f2ff", - "ignored": "#5a5462ff", + "ignored": "#6e6876ff", "ignored.background": "#bfbcc5ff", "ignored.border": "#8f8b96ff", "info": "#586cdaff", @@ -879,7 +879,7 @@ "hint": "#b17272ff", "hint.background": "#171e38ff", "hint.border": "#262f56ff", - "ignored": "#a4a08bff", + "ignored": "#8f8b77ff", "ignored.background": "#45433bff", "ignored.border": "#6c695cff", "info": "#6684e0ff", @@ -1263,7 +1263,7 @@ "hint": "#b37979ff", "hint.background": "#e3e5faff", "hint.border": "#cdd1f5ff", - "ignored": "#706d5fff", + "ignored": "#878471ff", "ignored.background": "#cecab4ff", "ignored.border": "#a8a48eff", "info": "#6684dfff", @@ -1647,7 +1647,7 @@ "hint": "#6f815aff", "hint.background": "#142319ff", "hint.border": "#1c3927ff", - "ignored": "#91907fff", + "ignored": "#7d7c6aff", "ignored.background": "#424136ff", "ignored.border": "#5d5c4cff", "info": "#36a165ff", @@ -2031,7 +2031,7 @@ "hint": "#758961ff", "hint.background": "#d9ecdfff", "hint.border": "#bbddc6ff", - "ignored": "#61604fff", + "ignored": "#767463ff", "ignored.background": "#c5c4b9ff", "ignored.border": "#969585ff", "info": "#37a165ff", @@ -2415,7 +2415,7 @@ "hint": "#a77087ff", "hint.background": "#0f1c3dff", "hint.border": "#182d5bff", - "ignored": "#a79f9dff", + "ignored": "#8e8683ff", "ignored.background": "#443c39ff", "ignored.border": "#665f5cff", "info": "#407ee6ff", @@ -2799,7 +2799,7 @@ "hint": "#a67287ff", "hint.background": "#dfe3fbff", "hint.border": "#c6cef7ff", - "ignored": "#6a6360ff", + "ignored": "#837b78ff", "ignored.background": "#ccc7c5ff", "ignored.border": "#aaa3a1ff", "info": "#407ee6ff", @@ -3183,7 +3183,7 @@ "hint": "#8d70a8ff", "hint.background": "#0d1a43ff", "hint.border": "#192961ff", - "ignored": "#a899a8ff", + "ignored": "#908190ff", "ignored.background": "#433a43ff", "ignored.border": "#675b67ff", "info": "#5169ebff", @@ -3567,7 +3567,7 @@ "hint": "#8c70a6ff", "hint.background": "#e2dffcff", "hint.border": "#cac7faff", - "ignored": "#6b5e6bff", + "ignored": "#857785ff", "ignored.background": "#c6b8c6ff", "ignored.border": "#ad9dadff", "info": "#5169ebff", @@ -3951,7 +3951,7 @@ "hint": "#52809aff", "hint.background": "#121c24ff", "hint.border": "#1a2f3cff", - "ignored": "#7c9fb3ff", + "ignored": "#688c9dff", "ignored.background": "#33444dff", "ignored.border": "#4f6a78ff", "info": "#267eadff", @@ -4335,7 +4335,7 @@ "hint": "#5a87a0ff", "hint.background": "#d8e4eeff", "hint.border": "#b9cee0ff", - "ignored": "#526f7dff", + "ignored": "#628496ff", "ignored.background": "#a6cadcff", "ignored.border": "#80a4b6ff", "info": "#267eadff", @@ -4719,7 +4719,7 @@ "hint": "#8a647aff", "hint.background": "#1c1b29ff", "hint.border": "#2c2b45ff", - "ignored": "#898383ff", + "ignored": "#756e6eff", "ignored.background": "#3b3535ff", "ignored.border": "#564e4eff", "info": "#7272caff", @@ -5103,7 +5103,7 @@ "hint": "#91697fff", "hint.background": "#e4e1f5ff", "hint.border": "#cecaecff", - "ignored": "#5a5252ff", + "ignored": "#6e6666ff", "ignored.background": "#c1bbbbff", "ignored.border": "#8e8989ff", "info": "#7272caff", @@ -5487,7 +5487,7 @@ "hint": "#607e76ff", "hint.background": "#151e20ff", "hint.border": "#1f3233ff", - "ignored": "#859188ff", + "ignored": "#6f7e74ff", "ignored.background": "#353f39ff", "ignored.border": "#505e55ff", "info": "#468b8fff", @@ -5871,7 +5871,7 @@ "hint": "#66847cff", "hint.background": "#dae7e8ff", "hint.border": "#bed4d6ff", - "ignored": "#546259ff", + "ignored": "#68766dff", "ignored.background": "#bcc5bfff", "ignored.border": "#8b968eff", "info": "#488b90ff", @@ -6255,7 +6255,7 @@ "hint": "#008b9fff", "hint.background": "#051949ff", "hint.border": "#102667ff", - "ignored": "#8ba48bff", + "ignored": "#778f77ff", "ignored.background": "#3b453bff", "ignored.border": "#5c6c5cff", "info": "#3e62f4ff", @@ -6639,7 +6639,7 @@ "hint": "#008fa1ff", "hint.background": "#e1ddfeff", "hint.border": "#c9c4fdff", - "ignored": "#5f705fff", + "ignored": "#718771ff", "ignored.background": "#b4ceb4ff", "ignored.border": "#8ea88eff", "info": "#3e61f4ff", @@ -7023,7 +7023,7 @@ "hint": "#6c81a5ff", "hint.background": "#161f2bff", "hint.border": "#203348ff", - "ignored": "#959bb2ff", + "ignored": "#7e849eff", "ignored.background": "#3e4769ff", "ignored.border": "#5b6385ff", "info": "#3e8ed0ff", @@ -7407,7 +7407,7 @@ "hint": "#7087b2ff", "hint.background": "#dde7f6ff", "hint.border": "#c2d5efff", - "ignored": "#5f6789ff", + "ignored": "#767d9aff", "ignored.background": "#c1c5d8ff", "ignored.border": "#9a9fb6ff", "info": "#3e8fd0ff", diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json index 87640ffeb9..e83d35f2ed 100644 --- a/assets/themes/ayu/ayu.json +++ b/assets/themes/ayu/ayu.json @@ -111,7 +111,7 @@ "hint": "#628b80ff", "hint.background": "#0d2f4eff", "hint.border": "#1b4a6eff", - "ignored": "#8a8986ff", + "ignored": "#696a6aff", "ignored.background": "#313337ff", "ignored.border": "#3f4043ff", "info": "#5ac1feff", @@ -480,7 +480,7 @@ "hint": "#8ca7c2ff", "hint.background": "#deebfaff", "hint.border": "#c4daf6ff", - "ignored": "#8b8e92ff", + "ignored": "#a9acaeff", "ignored.background": "#dcdddeff", "ignored.border": "#cfd1d2ff", "info": "#3b9ee5ff", @@ -849,7 +849,7 @@ "hint": "#7399a3ff", "hint.background": "#123950ff", "hint.border": "#24556fff", - "ignored": "#9a9a98ff", + "ignored": "#7b7d7fff", "ignored.background": "#464a52ff", "ignored.border": "#53565dff", "info": "#72cffeff", diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json index 8ba68c74db..5089f6c2da 100644 --- a/assets/themes/gruvbox/gruvbox.json +++ b/assets/themes/gruvbox/gruvbox.json @@ -111,7 +111,7 @@ "hint": "#8c957dff", "hint.background": "#1e2321ff", "hint.border": "#303a36ff", - "ignored": "#c5b597ff", + "ignored": "#998b78ff", "ignored.background": "#4c4642ff", "ignored.border": "#5b534dff", "info": "#83a598ff", @@ -485,7 +485,7 @@ "hint": "#6a695bff", "hint.background": "#1e2321ff", "hint.border": "#303a36ff", - "ignored": "#c5b597ff", + "ignored": "#998b78ff", "ignored.background": "#4c4642ff", "ignored.border": "#5b534dff", "info": "#83a598ff", @@ -859,7 +859,7 @@ "hint": "#8c957dff", "hint.background": "#1e2321ff", "hint.border": "#303a36ff", - "ignored": "#c5b597ff", + "ignored": "#998b78ff", "ignored.background": "#4c4642ff", "ignored.border": "#5b534dff", "info": "#83a598ff", @@ -1233,7 +1233,7 @@ "hint": "#677562ff", "hint.background": "#d2dee2ff", "hint.border": "#adc5ccff", - "ignored": "#5f5650ff", + "ignored": "#897b6eff", "ignored.background": "#d9c8a4ff", "ignored.border": "#c8b899ff", "info": "#0b6678ff", @@ -1607,7 +1607,7 @@ "hint": "#677562ff", "hint.background": "#d2dee2ff", "hint.border": "#adc5ccff", - "ignored": "#5f5650ff", + "ignored": "#897b6eff", "ignored.background": "#d9c8a4ff", "ignored.border": "#c8b899ff", "info": "#0b6678ff", @@ -1981,7 +1981,7 @@ "hint": "#677562ff", "hint.background": "#d2dee2ff", "hint.border": "#adc5ccff", - "ignored": "#5f5650ff", + "ignored": "#897b6eff", "ignored.background": "#d9c8a4ff", "ignored.border": "#c8b899ff", "info": "#0b6678ff", diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json index cdf9bb05fe..6c22473fdd 100644 --- a/assets/themes/one/one.json +++ b/assets/themes/one/one.json @@ -111,7 +111,7 @@ "hint": "#5a6f89ff", "hint.background": "#18243dff", "hint.border": "#293b5bff", - "ignored": "#838994ff", + "ignored": "#555a63ff", "ignored.background": "#3b414dff", "ignored.border": "#464b57ff", "info": "#74ade8ff", @@ -485,7 +485,7 @@ "hint": "#9294beff", "hint.background": "#e2e2faff", "hint.border": "#cbcdf6ff", - "ignored": "#7e8087ff", + "ignored": "#a1a1a3ff", "ignored.background": "#dcdcddff", "ignored.border": "#c9c9caff", "info": "#5c78e2ff", diff --git a/assets/themes/rose_pine/rose_pine.json b/assets/themes/rose_pine/rose_pine.json index 992ec52190..7d5865fdbe 100644 --- a/assets/themes/rose_pine/rose_pine.json +++ b/assets/themes/rose_pine/rose_pine.json @@ -111,7 +111,7 @@ "hint": "#5e768cff", "hint.background": "#2f3639ff", "hint.border": "#435255ff", - "ignored": "#74708dff", + "ignored": "#2f2b43ff", "ignored.background": "#292738ff", "ignored.border": "#423f55ff", "info": "#9bced6ff", @@ -490,7 +490,7 @@ "hint": "#7a92aaff", "hint.background": "#dde9ebff", "hint.border": "#c3d7dbff", - "ignored": "#706c8cff", + "ignored": "#938fa3ff", "ignored.background": "#dcd8d8ff", "ignored.border": "#dcd6d5ff", "info": "#57949fff", @@ -869,7 +869,7 @@ "hint": "#728aa2ff", "hint.background": "#2f3639ff", "hint.border": "#435255ff", - "ignored": "#85819eff", + "ignored": "#605d7aff", "ignored.background": "#38354eff", "ignored.border": "#504c68ff", "info": "#9bced6ff", diff --git a/assets/themes/sandcastle/sandcastle.json b/assets/themes/sandcastle/sandcastle.json index f56b1b8b4b..83f8ef68dd 100644 --- a/assets/themes/sandcastle/sandcastle.json +++ b/assets/themes/sandcastle/sandcastle.json @@ -111,7 +111,7 @@ "hint": "#727d68ff", "hint.background": "#171e1eff", "hint.border": "#223131ff", - "ignored": "#a69782ff", + "ignored": "#827568ff", "ignored.background": "#333944ff", "ignored.border": "#3d4350ff", "info": "#518b8bff", diff --git a/assets/themes/solarized/solarized.json b/assets/themes/solarized/solarized.json index c6e274860f..53a4441c9f 100644 --- a/assets/themes/solarized/solarized.json +++ b/assets/themes/solarized/solarized.json @@ -111,7 +111,7 @@ "hint": "#4f8297ff", "hint.background": "#141f2cff", "hint.border": "#1b3149ff", - "ignored": "#93a1a1ff", + "ignored": "#6f8389ff", "ignored.background": "#073743ff", "ignored.border": "#2b4e58ff", "info": "#278ad1ff", @@ -480,7 +480,7 @@ "hint": "#5789a3ff", "hint.background": "#dbe6f6ff", "hint.border": "#bfd3efff", - "ignored": "#34555eff", + "ignored": "#6a7f86ff", "ignored.background": "#cfd0c4ff", "ignored.border": "#9faaa8ff", "info": "#288bd1ff", diff --git a/assets/themes/summercamp/summercamp.json b/assets/themes/summercamp/summercamp.json index f46fb37744..35b101ea38 100644 --- a/assets/themes/summercamp/summercamp.json +++ b/assets/themes/summercamp/summercamp.json @@ -111,7 +111,7 @@ "hint": "#246e61ff", "hint.background": "#0e2242ff", "hint.border": "#193760ff", - "ignored": "#736e55ff", + "ignored": "#4c4735ff", "ignored.background": "#2a261cff", "ignored.border": "#302c21ff", "info": "#499befff", diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs index 84baa95d7e..3f681445ef 100644 --- a/crates/editor/src/items.rs +++ b/crates/editor/src/items.rs @@ -1194,7 +1194,7 @@ pub fn entry_git_aware_label_color( selected: bool, ) -> Color { if ignored { - Color::Disabled + Color::Ignored } else { match git_status { Some(GitFileStatus::Added) => Color::Created, diff --git a/crates/ui/src/styles/color.rs b/crates/ui/src/styles/color.rs index 1c9fd789d9..51bba25acd 100644 --- a/crates/ui/src/styles/color.rs +++ b/crates/ui/src/styles/color.rs @@ -15,6 +15,7 @@ pub enum Color { Info, Modified, Conflict, + Ignored, Muted, Placeholder, Player(u32), @@ -31,6 +32,7 @@ impl Color { Color::Created => cx.theme().status().created, Color::Modified => cx.theme().status().modified, Color::Conflict => cx.theme().status().conflict, + Color::Ignored => cx.theme().status().ignored, Color::Deleted => cx.theme().status().deleted, Color::Disabled => cx.theme().colors().text_disabled, Color::Hidden => cx.theme().status().hidden,