From e8a14b19715ba2ea06d6d84bbfba5080ffca33d6 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 22 Dec 2023 21:10:53 -0500 Subject: [PATCH 1/6] Adjust color used for text --- crates/theme2/src/themes/andromeda.rs | 2 +- crates/theme2/src/themes/atelier.rs | 40 ++++++++++----------- crates/theme2/src/themes/ayu.rs | 6 ++-- crates/theme2/src/themes/gruvbox.rs | 12 +++---- crates/theme2/src/themes/one.rs | 4 +-- crates/theme2/src/themes/rose_pine.rs | 6 ++-- crates/theme2/src/themes/sandcastle.rs | 2 +- crates/theme2/src/themes/solarized.rs | 4 +-- crates/theme2/src/themes/summercamp.rs | 2 +- crates/theme_importer/src/zed1/converter.rs | 2 +- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index 699abec4912a3b78333ac9f9988d0c8e19af2865..2130653e57b18701de0e1fac6248a4fd92597a2f 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -25,7 +25,7 @@ pub fn andromeda() -> UserThemeFamily { panel_background: Some(rgba(0x21242bff).into()), element_hover: Some(rgba(0x2b2f3980).into()), element_selected: Some(rgba(0x383b4580).into()), - text: Some(rgba(0xaca8aeff).into()), + text: Some(rgba(0xf7f7f8ff).into()), text_muted: Some(rgba(0x474a53ff).into()), text_placeholder: Some(rgba(0x474a53ff).into()), text_disabled: Some(rgba(0xf7f7f8ff).into()), diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs index 1722521b032cf3b963c89fcc0c9713579fa826ae..869fa44c0d7ac62a14922cadb6ec5d5f87f25f1a 100644 --- a/crates/theme2/src/themes/atelier.rs +++ b/crates/theme2/src/themes/atelier.rs @@ -26,7 +26,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xebeae3ff).into()), element_hover: Some(rgba(0x96958580).into()), element_selected: Some(rgba(0x8b8a7880).into()), - text: Some(rgba(0x61604fff).into()), + text: Some(rgba(0x22221bff).into()), text_muted: Some(rgba(0x878573ff).into()), text_placeholder: Some(rgba(0x878573ff).into()), text_disabled: Some(rgba(0x22221bff).into()), @@ -386,7 +386,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x27211eff).into()), element_hover: Some(rgba(0x665f5c80).into()), element_selected: Some(rgba(0x71696680).into()), - text: Some(rgba(0xa79f9dff).into()), + text: Some(rgba(0xf1efeeff).into()), text_muted: Some(rgba(0x766e6bff).into()), text_placeholder: Some(rgba(0x766e6bff).into()), text_disabled: Some(rgba(0xf1efeeff).into()), @@ -746,7 +746,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xe3ebe6ff).into()), element_hover: Some(rgba(0x8b968e80).into()), element_selected: Some(rgba(0x7e8b8280).into()), - text: Some(rgba(0x546259ff).into()), + text: Some(rgba(0x171c19ff).into()), text_muted: Some(rgba(0x79877dff).into()), text_placeholder: Some(rgba(0x79877dff).into()), text_disabled: Some(rgba(0x171c19ff).into()), @@ -1106,7 +1106,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x221f26ff).into()), element_hover: Some(rgba(0x56505e80).into()), element_selected: Some(rgba(0x605a6880).into()), - text: Some(rgba(0x898591ff).into()), + text: Some(rgba(0xefecf4ff).into()), text_muted: Some(rgba(0x655f6dff).into()), text_placeholder: Some(rgba(0x655f6dff).into()), text_disabled: Some(rgba(0xefecf4ff).into()), @@ -1466,7 +1466,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x2c2b23ff).into()), element_hover: Some(rgba(0x5d5c4c80).into()), element_selected: Some(rgba(0x67665580).into()), - text: Some(rgba(0x91907fff).into()), + text: Some(rgba(0xf4f3ecff).into()), text_muted: Some(rgba(0x6c6b5aff).into()), text_placeholder: Some(rgba(0x6c6b5aff).into()), text_disabled: Some(rgba(0xf4f3ecff).into()), @@ -1826,7 +1826,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x262f51ff).into()), element_hover: Some(rgba(0x5c648580).into()), element_selected: Some(rgba(0x666e8f80).into()), - text: Some(rgba(0x959bb2ff).into()), + text: Some(rgba(0xf5f7ffff).into()), text_muted: Some(rgba(0x6b7394ff).into()), text_placeholder: Some(rgba(0x6b7394ff).into()), text_disabled: Some(rgba(0xf5f7ffff).into()), @@ -2186,7 +2186,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xe5e8f5ff).into()), element_hover: Some(rgba(0x9a9fb680).into()), element_selected: Some(rgba(0x8e94aa80).into()), - text: Some(rgba(0x606889ff).into()), + text: Some(rgba(0x202746ff).into()), text_muted: Some(rgba(0x898fa5ff).into()), text_placeholder: Some(rgba(0x898fa5ff).into()), text_disabled: Some(rgba(0x202746ff).into()), @@ -2546,7 +2546,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x262622ff).into()), element_hover: Some(rgba(0x6c695c80).into()), element_selected: Some(rgba(0x77746480).into()), - text: Some(rgba(0xa4a08bff).into()), + text: Some(rgba(0xfefbecff).into()), text_muted: Some(rgba(0x7c7968ff).into()), text_placeholder: Some(rgba(0x7c7968ff).into()), text_disabled: Some(rgba(0xfefbecff).into()), @@ -2906,7 +2906,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x1f231fff).into()), element_hover: Some(rgba(0x5c6c5c80).into()), element_selected: Some(rgba(0x64776480).into()), - text: Some(rgba(0x8ba48bff).into()), + text: Some(rgba(0xf4fbf4ff).into()), text_muted: Some(rgba(0x687c68ff).into()), text_placeholder: Some(rgba(0x687c68ff).into()), text_disabled: Some(rgba(0xf4fbf4ff).into()), @@ -3266,7 +3266,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xe6e3ebff).into()), element_hover: Some(rgba(0x8f8b9680).into()), element_selected: Some(rgba(0x837e8b80).into()), - text: Some(rgba(0x5a5462ff).into()), + text: Some(rgba(0x19171cff).into()), text_muted: Some(rgba(0x7e7987ff).into()), text_placeholder: Some(rgba(0x7e7987ff).into()), text_disabled: Some(rgba(0x19171cff).into()), @@ -3626,7 +3626,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x252020ff).into()), element_hover: Some(rgba(0x564e4e80).into()), element_selected: Some(rgba(0x60585880).into()), - text: Some(rgba(0x898383ff).into()), + text: Some(rgba(0xf4ececff).into()), text_muted: Some(rgba(0x655d5dff).into()), text_placeholder: Some(rgba(0x655d5dff).into()), text_disabled: Some(rgba(0xf4ececff).into()), @@ -3986,7 +3986,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x252025ff).into()), element_hover: Some(rgba(0x675b6780).into()), element_selected: Some(rgba(0x72647280).into()), - text: Some(rgba(0xa99aa9ff).into()), + text: Some(rgba(0xf7f3f7ff).into()), text_muted: Some(rgba(0x776977ff).into()), text_placeholder: Some(rgba(0x776977ff).into()), text_disabled: Some(rgba(0xf7f3f7ff).into()), @@ -4346,7 +4346,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x1c2529ff).into()), element_hover: Some(rgba(0x4f6b7880).into()), element_selected: Some(rgba(0x57768580).into()), - text: Some(rgba(0x7ca0b3ff).into()), + text: Some(rgba(0xebf8ffff).into()), text_muted: Some(rgba(0x5a7b8bff).into()), text_placeholder: Some(rgba(0x5a7b8bff).into()), text_disabled: Some(rgba(0xebf8ffff).into()), @@ -4706,7 +4706,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xe9e6e4ff).into()), element_hover: Some(rgba(0xaaa3a180).into()), element_selected: Some(rgba(0xa1999680).into()), - text: Some(rgba(0x6a6360ff).into()), + text: Some(rgba(0x1b1918ff).into()), text_muted: Some(rgba(0x9c9491ff).into()), text_placeholder: Some(rgba(0x9c9491ff).into()), text_disabled: Some(rgba(0x1b1918ff).into()), @@ -5066,7 +5066,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xeeebd7ff).into()), element_hover: Some(rgba(0xa8a48e80).into()), element_selected: Some(rgba(0x9e9a8580).into()), - text: Some(rgba(0x706d5fff).into()), + text: Some(rgba(0x20201dff).into()), text_muted: Some(rgba(0x999580ff).into()), text_placeholder: Some(rgba(0x999580ff).into()), text_disabled: Some(rgba(0x20201dff).into()), @@ -5426,7 +5426,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xebe3e3ff).into()), element_hover: Some(rgba(0x8e898980).into()), element_selected: Some(rgba(0x837c7c80).into()), - text: Some(rgba(0x5a5252ff).into()), + text: Some(rgba(0x1b1818ff).into()), text_muted: Some(rgba(0x7e7777ff).into()), text_placeholder: Some(rgba(0x7e7777ff).into()), text_disabled: Some(rgba(0x1b1818ff).into()), @@ -5786,7 +5786,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xdaeedaff).into()), element_hover: Some(rgba(0x8ea88e80).into()), element_selected: Some(rgba(0x859e8580).into()), - text: Some(rgba(0x5f705fff).into()), + text: Some(rgba(0x131513ff).into()), text_muted: Some(rgba(0x809980ff).into()), text_placeholder: Some(rgba(0x809980ff).into()), text_disabled: Some(rgba(0x131513ff).into()), @@ -6146,7 +6146,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0x1f2621ff).into()), element_hover: Some(rgba(0x505e5580).into()), element_selected: Some(rgba(0x5a685f80).into()), - text: Some(rgba(0x859188ff).into()), + text: Some(rgba(0xecf4eeff).into()), text_muted: Some(rgba(0x5f6d64ff).into()), text_placeholder: Some(rgba(0x5f6d64ff).into()), text_disabled: Some(rgba(0xecf4eeff).into()), @@ -6506,7 +6506,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xe1d6e1ff).into()), element_hover: Some(rgba(0xad9dad80).into()), element_selected: Some(rgba(0xa394a380).into()), - text: Some(rgba(0x6b5e6bff).into()), + text: Some(rgba(0x1b181bff).into()), text_muted: Some(rgba(0x9e8f9eff).into()), text_placeholder: Some(rgba(0x9e8f9eff).into()), text_disabled: Some(rgba(0x1b181bff).into()), @@ -6866,7 +6866,7 @@ pub fn atelier() -> UserThemeFamily { panel_background: Some(rgba(0xcdeaf9ff).into()), element_hover: Some(rgba(0x80a4b680).into()), element_selected: Some(rgba(0x769aad80).into()), - text: Some(rgba(0x526f7dff).into()), + text: Some(rgba(0x161b1dff).into()), text_muted: Some(rgba(0x7195a8ff).into()), text_placeholder: Some(rgba(0x7195a8ff).into()), text_disabled: Some(rgba(0x161b1dff).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index eb6ac40bcedbb192fbc2f67efb54415692dcad4c..45b6cea310b5af8ae3614064adfa7e4241b9dc44 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -26,7 +26,7 @@ pub fn ayu() -> UserThemeFamily { panel_background: Some(rgba(0x1f2127ff).into()), element_hover: Some(rgba(0x3f404380).into()), element_selected: Some(rgba(0x50515280).into()), - text: Some(rgba(0x8a8986ff).into()), + text: Some(rgba(0xbfbdb6ff).into()), text_muted: Some(rgba(0x58595aff).into()), text_placeholder: Some(rgba(0x58595aff).into()), text_disabled: Some(rgba(0xbfbdb6ff).into()), @@ -365,7 +365,7 @@ pub fn ayu() -> UserThemeFamily { panel_background: Some(rgba(0xececedff).into()), element_hover: Some(rgba(0xcfd1d280).into()), element_selected: Some(rgba(0xc0c2c480).into()), - text: Some(rgba(0x8c8f93ff).into()), + text: Some(rgba(0x5c6166ff).into()), text_muted: Some(rgba(0xb9bbbdff).into()), text_placeholder: Some(rgba(0xb9bbbdff).into()), text_disabled: Some(rgba(0x5c6166ff).into()), @@ -704,7 +704,7 @@ pub fn ayu() -> UserThemeFamily { panel_background: Some(rgba(0x353944ff).into()), element_hover: Some(rgba(0x53565d80).into()), element_selected: Some(rgba(0x63656a80).into()), - text: Some(rgba(0x9a9a98ff).into()), + text: Some(rgba(0xcccac2ff).into()), text_muted: Some(rgba(0x6b6d71ff).into()), text_placeholder: Some(rgba(0x6b6d71ff).into()), text_disabled: Some(rgba(0xcccac2ff).into()), diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 2dcf717c47561b05d88a60045379f32c481227d1..8b85ff285481da1ae6aeaf84e0c12229bf9a1cad 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -26,7 +26,7 @@ pub fn gruvbox() -> UserThemeFamily { panel_background: Some(rgba(0xecddb5ff).into()), element_hover: Some(rgba(0xc9b99a80).into()), element_selected: Some(rgba(0xb5a68e80).into()), - text: Some(rgba(0x5f5650ff).into()), + text: Some(rgba(0x282828ff).into()), text_muted: Some(rgba(0xad9e87ff).into()), text_placeholder: Some(rgba(0xad9e87ff).into()), text_disabled: Some(rgba(0x282828ff).into()), @@ -372,7 +372,7 @@ pub fn gruvbox() -> UserThemeFamily { panel_background: Some(rgba(0x3b3735ff).into()), element_hover: Some(rgba(0x5b534d80).into()), element_selected: Some(rgba(0x6e635a80).into()), - text: Some(rgba(0xc5b597ff).into()), + text: Some(rgba(0xfbf1c7ff).into()), text_muted: Some(rgba(0x776b61ff).into()), text_placeholder: Some(rgba(0x776b61ff).into()), text_disabled: Some(rgba(0xfbf1c7ff).into()), @@ -718,7 +718,7 @@ pub fn gruvbox() -> UserThemeFamily { panel_background: Some(rgba(0xecddb4ff).into()), element_hover: Some(rgba(0xc9b99a80).into()), element_selected: Some(rgba(0xb5a68e80).into()), - text: Some(rgba(0x5f5650ff).into()), + text: Some(rgba(0x282828ff).into()), text_muted: Some(rgba(0xad9e87ff).into()), text_placeholder: Some(rgba(0xad9e87ff).into()), text_disabled: Some(rgba(0x282828ff).into()), @@ -1064,7 +1064,7 @@ pub fn gruvbox() -> UserThemeFamily { panel_background: Some(rgba(0x3a3735ff).into()), element_hover: Some(rgba(0x5b534d80).into()), element_selected: Some(rgba(0x6e635a80).into()), - text: Some(rgba(0xc5b597ff).into()), + text: Some(rgba(0xfbf1c7ff).into()), text_muted: Some(rgba(0x776b61ff).into()), text_placeholder: Some(rgba(0x776b61ff).into()), text_disabled: Some(rgba(0xfbf1c7ff).into()), @@ -1410,7 +1410,7 @@ pub fn gruvbox() -> UserThemeFamily { panel_background: Some(rgba(0xecdcb3ff).into()), element_hover: Some(rgba(0xc9b99a80).into()), element_selected: Some(rgba(0xb5a68e80).into()), - text: Some(rgba(0x5f5650ff).into()), + text: Some(rgba(0x282828ff).into()), text_muted: Some(rgba(0xad9e87ff).into()), text_placeholder: Some(rgba(0xad9e87ff).into()), text_disabled: Some(rgba(0x282828ff).into()), @@ -1756,7 +1756,7 @@ pub fn gruvbox() -> UserThemeFamily { panel_background: Some(rgba(0x393634ff).into()), element_hover: Some(rgba(0x5b534d80).into()), element_selected: Some(rgba(0x6e635a80).into()), - text: Some(rgba(0xc5b597ff).into()), + text: Some(rgba(0xfbf1c7ff).into()), text_muted: Some(rgba(0x776b61ff).into()), text_placeholder: Some(rgba(0x776b61ff).into()), text_disabled: Some(rgba(0xfbf1c7ff).into()), diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs index 3a20146be1b19c37562a08b49fb63a65102f93db..8de6c06de6876ae5154ccea9d94b30a0bf89c62e 100644 --- a/crates/theme2/src/themes/one.rs +++ b/crates/theme2/src/themes/one.rs @@ -26,7 +26,7 @@ pub fn one() -> UserThemeFamily { panel_background: Some(rgba(0xebebecff).into()), element_hover: Some(rgba(0xc9c9ca80).into()), element_selected: Some(rgba(0xafafaf80).into()), - text: Some(rgba(0x7f8188ff).into()), + text: Some(rgba(0x383a41ff).into()), text_muted: Some(rgba(0xa7a7a8ff).into()), text_placeholder: Some(rgba(0xa7a7a8ff).into()), text_disabled: Some(rgba(0x383a41ff).into()), @@ -372,7 +372,7 @@ pub fn one() -> UserThemeFamily { panel_background: Some(rgba(0x2f343eff).into()), element_hover: Some(rgba(0x464b5780).into()), element_selected: Some(rgba(0x4f545e80).into()), - text: Some(rgba(0x838994ff).into()), + text: Some(rgba(0xc8ccd4ff).into()), text_muted: Some(rgba(0x545862ff).into()), text_placeholder: Some(rgba(0x545862ff).into()), text_disabled: Some(rgba(0xc8ccd4ff).into()), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index 1dcf523a74304f6555aa38d55a8e97c0e894255b..5f8ed063a35ab28d74548def098c0ce1687369ca 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -26,7 +26,7 @@ pub fn rose_pine() -> UserThemeFamily { panel_background: Some(rgba(0xfef9f2ff).into()), element_hover: Some(rgba(0xdcd6d580).into()), element_selected: Some(rgba(0xc1bac180).into()), - text: Some(rgba(0x706c8cff).into()), + text: Some(rgba(0x575279ff).into()), text_muted: Some(rgba(0xb1abb5ff).into()), text_placeholder: Some(rgba(0xb1abb5ff).into()), text_disabled: Some(rgba(0x575279ff).into()), @@ -379,7 +379,7 @@ pub fn rose_pine() -> UserThemeFamily { panel_background: Some(rgba(0x28253cff).into()), element_hover: Some(rgba(0x504c6880).into()), element_selected: Some(rgba(0x45415d80).into()), - text: Some(rgba(0x85819eff).into()), + text: Some(rgba(0xe0def4ff).into()), text_muted: Some(rgba(0x3a3653ff).into()), text_placeholder: Some(rgba(0x3a3653ff).into()), text_disabled: Some(rgba(0xe0def4ff).into()), @@ -732,7 +732,7 @@ pub fn rose_pine() -> UserThemeFamily { panel_background: Some(rgba(0x1d1b2aff).into()), element_hover: Some(rgba(0x423f5580).into()), element_selected: Some(rgba(0x47445b80).into()), - text: Some(rgba(0x75718eff).into()), + text: Some(rgba(0xe0def4ff).into()), text_muted: Some(rgba(0x3b384fff).into()), text_placeholder: Some(rgba(0x3b384fff).into()), text_disabled: Some(rgba(0xe0def4ff).into()), diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs index c0bd53b2d6506d5b148245398f77a413314f4be8..9b6828d82f5c9ae18873582b552e0b31c5e0b1bb 100644 --- a/crates/theme2/src/themes/sandcastle.rs +++ b/crates/theme2/src/themes/sandcastle.rs @@ -25,7 +25,7 @@ pub fn sandcastle() -> UserThemeFamily { panel_background: Some(rgba(0x2b3039ff).into()), element_hover: Some(rgba(0x3d435080).into()), element_selected: Some(rgba(0x57535380).into()), - text: Some(rgba(0xa69782ff).into()), + text: Some(rgba(0xfdf4c1ff).into()), text_muted: Some(rgba(0x645b54ff).into()), text_placeholder: Some(rgba(0x645b54ff).into()), text_disabled: Some(rgba(0xfdf4c1ff).into()), diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index e358537dfbaa418bd49501f0f23a7777e96c00d1..7aece1c6c47929e7551c14819c4af381fb05e056 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -26,7 +26,7 @@ pub fn solarized() -> UserThemeFamily { panel_background: Some(rgba(0xf3eddaff).into()), element_hover: Some(rgba(0x9faaa880).into()), element_selected: Some(rgba(0x7f919480).into()), - text: Some(rgba(0x34555eff).into()), + text: Some(rgba(0x002b36ff).into()), text_muted: Some(rgba(0x788b8fff).into()), text_placeholder: Some(rgba(0x788b8fff).into()), text_disabled: Some(rgba(0x002b36ff).into()), @@ -365,7 +365,7 @@ pub fn solarized() -> UserThemeFamily { panel_background: Some(rgba(0x04313cff).into()), element_hover: Some(rgba(0x2b4f5880).into()), element_selected: Some(rgba(0x566d7480).into()), - text: Some(rgba(0x93a1a1ff).into()), + text: Some(rgba(0xfdf6e3ff).into()), text_muted: Some(rgba(0x5f757dff).into()), text_placeholder: Some(rgba(0x5f757dff).into()), text_disabled: Some(rgba(0xfdf6e3ff).into()), diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs index eab403fe79fcd53463dc3ac4e4714ebe24528c0a..6d36acd2edee5ba08c8873b704e141023081321a 100644 --- a/crates/theme2/src/themes/summercamp.rs +++ b/crates/theme2/src/themes/summercamp.rs @@ -25,7 +25,7 @@ pub fn summercamp() -> UserThemeFamily { panel_background: Some(rgba(0x231f16ff).into()), element_hover: Some(rgba(0x312d2180).into()), element_selected: Some(rgba(0x39342780).into()), - text: Some(rgba(0x736e55ff).into()), + text: Some(rgba(0xf8f5deff).into()), text_muted: Some(rgba(0x3d382aff).into()), text_placeholder: Some(rgba(0x3d382aff).into()), text_disabled: Some(rgba(0xf8f5deff).into()), diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs index 87318199cf61b220772e46264f6f75355a0ca3de..2ce98a497bdb8a06e64d53d3015beca88be90bad 100644 --- a/crates/theme_importer/src/zed1/converter.rs +++ b/crates/theme_importer/src/zed1/converter.rs @@ -116,7 +116,7 @@ impl Zed1ThemeConverter { .container .background_color .map(zed1_color_to_hsla), - text: convert(self.theme.project_panel.entry.default_style().text.color), + text: convert(self.theme.collab_panel.channel_name.text.color), text_muted: convert(active_tab.description.text.color), text_accent: convert(status_bar.panel_buttons.button.active_state().icon_color), text_disabled: convert(status_bar.panel_buttons.button.disabled_style().icon_color), From 9cb613245e319d996f6918ed119bd4c2aef43c57 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 22 Dec 2023 21:18:43 -0500 Subject: [PATCH 2/6] Adjust border colors --- crates/theme2/src/themes/andromeda.rs | 4 +- crates/theme2/src/themes/atelier.rs | 80 ++++++++++----------- crates/theme2/src/themes/ayu.rs | 12 ++-- crates/theme2/src/themes/gruvbox.rs | 24 +++---- crates/theme2/src/themes/one.rs | 8 +-- crates/theme2/src/themes/rose_pine.rs | 12 ++-- crates/theme2/src/themes/sandcastle.rs | 4 +- crates/theme2/src/themes/solarized.rs | 8 +-- crates/theme2/src/themes/summercamp.rs | 4 +- crates/theme_importer/src/zed1/converter.rs | 6 +- 10 files changed, 80 insertions(+), 82 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index 2130653e57b18701de0e1fac6248a4fd92597a2f..a7cf529222375bb1ece74e412f070dc69937e731 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -18,8 +18,8 @@ pub fn andromeda() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x2b2f39ff).into()), - border_variant: Some(rgba(0x2b2f39ff).into()), + border: Some(rgba(0x252931ff).into()), + border_variant: Some(rgba(0x21232aff).into()), elevated_surface_background: Some(rgba(0x262a33ff).into()), background: Some(rgba(0x262a33ff).into()), panel_background: Some(rgba(0x21242bff).into()), diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs index 869fa44c0d7ac62a14922cadb6ec5d5f87f25f1a..3a1f94c8880537445d779d3bdcec2e0e957233e3 100644 --- a/crates/theme2/src/themes/atelier.rs +++ b/crates/theme2/src/themes/atelier.rs @@ -19,8 +19,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x969585ff).into()), - border_variant: Some(rgba(0x969585ff).into()), + border: Some(rgba(0xd1d0c6ff).into()), + border_variant: Some(rgba(0xedece5ff).into()), elevated_surface_background: Some(rgba(0xc5c4b9ff).into()), background: Some(rgba(0xc5c4b9ff).into()), panel_background: Some(rgba(0xebeae3ff).into()), @@ -379,8 +379,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x665f5cff).into()), - border_variant: Some(rgba(0x665f5cff).into()), + border: Some(rgba(0x3b3431ff).into()), + border_variant: Some(rgba(0x251f1dff).into()), elevated_surface_background: Some(rgba(0x443c39ff).into()), background: Some(rgba(0x443c39ff).into()), panel_background: Some(rgba(0x27211eff).into()), @@ -739,8 +739,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x8b968eff).into()), - border_variant: Some(rgba(0x8b968eff).into()), + border: Some(rgba(0xc8d1cbff).into()), + border_variant: Some(rgba(0xe5ede7ff).into()), elevated_surface_background: Some(rgba(0xbcc5bfff).into()), background: Some(rgba(0xbcc5bfff).into()), panel_background: Some(rgba(0xe3ebe6ff).into()), @@ -1099,8 +1099,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x56505eff).into()), - border_variant: Some(rgba(0x56505eff).into()), + border: Some(rgba(0x332f38ff).into()), + border_variant: Some(rgba(0x201e24ff).into()), elevated_surface_background: Some(rgba(0x3a353fff).into()), background: Some(rgba(0x3a353fff).into()), panel_background: Some(rgba(0x221f26ff).into()), @@ -1459,8 +1459,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x5d5c4cff).into()), - border_variant: Some(rgba(0x5d5c4cff).into()), + border: Some(rgba(0x3c3b31ff).into()), + border_variant: Some(rgba(0x2a2922ff).into()), elevated_surface_background: Some(rgba(0x424136ff).into()), background: Some(rgba(0x424136ff).into()), panel_background: Some(rgba(0x2c2b23ff).into()), @@ -1819,8 +1819,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x5c6485ff).into()), - border_variant: Some(rgba(0x5c6485ff).into()), + border: Some(rgba(0x363f62ff).into()), + border_variant: Some(rgba(0x252d4fff).into()), elevated_surface_background: Some(rgba(0x3e4769ff).into()), background: Some(rgba(0x3e4769ff).into()), panel_background: Some(rgba(0x262f51ff).into()), @@ -2179,8 +2179,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x9a9fb6ff).into()), - border_variant: Some(rgba(0x9a9fb6ff).into()), + border: Some(rgba(0xccd0e1ff).into()), + border_variant: Some(rgba(0xe9ebf7ff).into()), elevated_surface_background: Some(rgba(0xc2c6d9ff).into()), background: Some(rgba(0xc2c6d9ff).into()), panel_background: Some(rgba(0xe5e8f5ff).into()), @@ -2539,8 +2539,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x6c695cff).into()), - border_variant: Some(rgba(0x6c695cff).into()), + border: Some(rgba(0x3b3933ff).into()), + border_variant: Some(rgba(0x252521ff).into()), elevated_surface_background: Some(rgba(0x45433bff).into()), background: Some(rgba(0x45433bff).into()), panel_background: Some(rgba(0x262622ff).into()), @@ -2899,8 +2899,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x5c6c5cff).into()), - border_variant: Some(rgba(0x5c6c5cff).into()), + border: Some(rgba(0x333b33ff).into()), + border_variant: Some(rgba(0x1d201dff).into()), elevated_surface_background: Some(rgba(0x3b453bff).into()), background: Some(rgba(0x3b453bff).into()), panel_background: Some(rgba(0x1f231fff).into()), @@ -3259,8 +3259,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x8f8b96ff).into()), - border_variant: Some(rgba(0x8f8b96ff).into()), + border: Some(rgba(0xcbc8d1ff).into()), + border_variant: Some(rgba(0xe8e5edff).into()), elevated_surface_background: Some(rgba(0xbfbcc5ff).into()), background: Some(rgba(0xbfbcc5ff).into()), panel_background: Some(rgba(0xe6e3ebff).into()), @@ -3619,8 +3619,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x564e4eff).into()), - border_variant: Some(rgba(0x564e4eff).into()), + border: Some(rgba(0x352f2fff).into()), + border_variant: Some(rgba(0x231f1fff).into()), elevated_surface_background: Some(rgba(0x3b3535ff).into()), background: Some(rgba(0x3b3535ff).into()), panel_background: Some(rgba(0x252020ff).into()), @@ -3979,8 +3979,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x675b67ff).into()), - border_variant: Some(rgba(0x675b67ff).into()), + border: Some(rgba(0x393239ff).into()), + border_variant: Some(rgba(0x231e23ff).into()), elevated_surface_background: Some(rgba(0x433a43ff).into()), background: Some(rgba(0x433a43ff).into()), panel_background: Some(rgba(0x252025ff).into()), @@ -4339,8 +4339,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x4f6b78ff).into()), - border_variant: Some(rgba(0x4f6b78ff).into()), + border: Some(rgba(0x2c3b42ff).into()), + border_variant: Some(rgba(0x1b2327ff).into()), elevated_surface_background: Some(rgba(0x33444dff).into()), background: Some(rgba(0x33444dff).into()), panel_background: Some(rgba(0x1c2529ff).into()), @@ -4699,8 +4699,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xaaa3a1ff).into()), - border_variant: Some(rgba(0xaaa3a1ff).into()), + border: Some(rgba(0xd6d1cfff).into()), + border_variant: Some(rgba(0xebe8e6ff).into()), elevated_surface_background: Some(rgba(0xcdc8c6ff).into()), background: Some(rgba(0xcdc8c6ff).into()), panel_background: Some(rgba(0xe9e6e4ff).into()), @@ -5059,8 +5059,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xa8a48eff).into()), - border_variant: Some(rgba(0xa8a48eff).into()), + border: Some(rgba(0xd7d3beff).into()), + border_variant: Some(rgba(0xf2eedcff).into()), elevated_surface_background: Some(rgba(0xcecab4ff).into()), background: Some(rgba(0xcecab4ff).into()), panel_background: Some(rgba(0xeeebd7ff).into()), @@ -5419,8 +5419,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x8e8989ff).into()), - border_variant: Some(rgba(0x8e8989ff).into()), + border: Some(rgba(0xcfc7c7ff).into()), + border_variant: Some(rgba(0xede5e5ff).into()), elevated_surface_background: Some(rgba(0xc1bbbbff).into()), background: Some(rgba(0xc1bbbbff).into()), panel_background: Some(rgba(0xebe3e3ff).into()), @@ -5779,8 +5779,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x8ea88eff).into()), - border_variant: Some(rgba(0x8ea88eff).into()), + border: Some(rgba(0xbed7beff).into()), + border_variant: Some(rgba(0xdff0dfff).into()), elevated_surface_background: Some(rgba(0xb4ceb4ff).into()), background: Some(rgba(0xb4ceb4ff).into()), panel_background: Some(rgba(0xdaeedaff).into()), @@ -6139,8 +6139,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x505e55ff).into()), - border_variant: Some(rgba(0x505e55ff).into()), + border: Some(rgba(0x2f3832ff).into()), + border_variant: Some(rgba(0x1e2420ff).into()), elevated_surface_background: Some(rgba(0x353f39ff).into()), background: Some(rgba(0x353f39ff).into()), panel_background: Some(rgba(0x1f2621ff).into()), @@ -6499,8 +6499,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xad9dadff).into()), - border_variant: Some(rgba(0xad9dadff).into()), + border: Some(rgba(0xcdbecdff).into()), + border_variant: Some(rgba(0xe5dce5ff).into()), elevated_surface_background: Some(rgba(0xc6b8c6ff).into()), background: Some(rgba(0xc6b8c6ff).into()), panel_background: Some(rgba(0xe1d6e1ff).into()), @@ -6859,8 +6859,8 @@ pub fn atelier() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x80a4b6ff).into()), - border_variant: Some(rgba(0x80a4b6ff).into()), + border: Some(rgba(0xb0d3e5ff).into()), + border_variant: Some(rgba(0xd3edfaff).into()), elevated_surface_background: Some(rgba(0xa6cadcff).into()), background: Some(rgba(0xa6cadcff).into()), panel_background: Some(rgba(0xcdeaf9ff).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index 45b6cea310b5af8ae3614064adfa7e4241b9dc44..deab32b8124920fc89a04f5b44da73c346437e51 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -19,8 +19,8 @@ pub fn ayu() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x3f4043ff).into()), - border_variant: Some(rgba(0x3f4043ff).into()), + border: Some(rgba(0x2d2f34ff).into()), + border_variant: Some(rgba(0x1b1e24ff).into()), elevated_surface_background: Some(rgba(0x313337ff).into()), background: Some(rgba(0x313337ff).into()), panel_background: Some(rgba(0x1f2127ff).into()), @@ -358,8 +358,8 @@ pub fn ayu() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xcfd1d2ff).into()), - border_variant: Some(rgba(0xcfd1d2ff).into()), + border: Some(rgba(0xdfe0e1ff).into()), + border_variant: Some(rgba(0xefeff0ff).into()), elevated_surface_background: Some(rgba(0xdcdddeff).into()), background: Some(rgba(0xdcdddeff).into()), panel_background: Some(rgba(0xececedff).into()), @@ -697,8 +697,8 @@ pub fn ayu() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x53565dff).into()), - border_variant: Some(rgba(0x53565dff).into()), + border: Some(rgba(0x43464fff).into()), + border_variant: Some(rgba(0x323641ff).into()), elevated_surface_background: Some(rgba(0x464a52ff).into()), background: Some(rgba(0x464a52ff).into()), panel_background: Some(rgba(0x353944ff).into()), diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 8b85ff285481da1ae6aeaf84e0c12229bf9a1cad..8512706fd4fd3d8c249fc94f4708880a896052fa 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -19,8 +19,8 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xc9b99aff).into()), - border_variant: Some(rgba(0xc9b99aff).into()), + border: Some(rgba(0xddcca7ff).into()), + border_variant: Some(rgba(0xefe2bcff).into()), elevated_surface_background: Some(rgba(0xd9c8a4ff).into()), background: Some(rgba(0xd9c8a4ff).into()), panel_background: Some(rgba(0xecddb5ff).into()), @@ -365,8 +365,8 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x5b534dff).into()), - border_variant: Some(rgba(0x5b534dff).into()), + border: Some(rgba(0x494340ff).into()), + border_variant: Some(rgba(0x393634ff).into()), elevated_surface_background: Some(rgba(0x4c4642ff).into()), background: Some(rgba(0x4c4642ff).into()), panel_background: Some(rgba(0x3b3735ff).into()), @@ -711,8 +711,8 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xc9b99aff).into()), - border_variant: Some(rgba(0xc9b99aff).into()), + border: Some(rgba(0xddcca7ff).into()), + border_variant: Some(rgba(0xefe1b8ff).into()), elevated_surface_background: Some(rgba(0xd9c8a4ff).into()), background: Some(rgba(0xd9c8a4ff).into()), panel_background: Some(rgba(0xecddb4ff).into()), @@ -1057,8 +1057,8 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x5b534dff).into()), - border_variant: Some(rgba(0x5b534dff).into()), + border: Some(rgba(0x494340ff).into()), + border_variant: Some(rgba(0x373432ff).into()), elevated_surface_background: Some(rgba(0x4c4642ff).into()), background: Some(rgba(0x4c4642ff).into()), panel_background: Some(rgba(0x3a3735ff).into()), @@ -1403,8 +1403,8 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xc9b99aff).into()), - border_variant: Some(rgba(0xc9b99aff).into()), + border: Some(rgba(0xddcca7ff).into()), + border_variant: Some(rgba(0xeddeb5ff).into()), elevated_surface_background: Some(rgba(0xd9c8a4ff).into()), background: Some(rgba(0xd9c8a4ff).into()), panel_background: Some(rgba(0xecdcb3ff).into()), @@ -1749,8 +1749,8 @@ pub fn gruvbox() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x5b534dff).into()), - border_variant: Some(rgba(0x5b534dff).into()), + border: Some(rgba(0x494340ff).into()), + border_variant: Some(rgba(0x343130ff).into()), elevated_surface_background: Some(rgba(0x4c4642ff).into()), background: Some(rgba(0x4c4642ff).into()), panel_background: Some(rgba(0x393634ff).into()), diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs index 8de6c06de6876ae5154ccea9d94b30a0bf89c62e..dcd90bf1afed088f984a0ed8ade8fd00c82f3bf8 100644 --- a/crates/theme2/src/themes/one.rs +++ b/crates/theme2/src/themes/one.rs @@ -19,8 +19,8 @@ pub fn one() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xc9c9caff).into()), - border_variant: Some(rgba(0xc9c9caff).into()), + border: Some(rgba(0xdfdfe0ff).into()), + border_variant: Some(rgba(0xeeeeeeff).into()), elevated_surface_background: Some(rgba(0xdcdcddff).into()), background: Some(rgba(0xdcdcddff).into()), panel_background: Some(rgba(0xebebecff).into()), @@ -365,8 +365,8 @@ pub fn one() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x464b57ff).into()), - border_variant: Some(rgba(0x464b57ff).into()), + border: Some(rgba(0x363c46ff).into()), + border_variant: Some(rgba(0x2e333cff).into()), elevated_surface_background: Some(rgba(0x3b414dff).into()), background: Some(rgba(0x3b414dff).into()), panel_background: Some(rgba(0x2f343eff).into()), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index 5f8ed063a35ab28d74548def098c0ce1687369ca..a08618ca6a85657f0c1b9d51918e4b4121f06175 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -19,8 +19,8 @@ pub fn rose_pine() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0xdcd6d5ff).into()), - border_variant: Some(rgba(0xdcd6d5ff).into()), + border: Some(rgba(0xe5e0dfff).into()), + border_variant: Some(rgba(0xfdf8f1ff).into()), elevated_surface_background: Some(rgba(0xdcd8d8ff).into()), background: Some(rgba(0xdcd8d8ff).into()), panel_background: Some(rgba(0xfef9f2ff).into()), @@ -372,8 +372,8 @@ pub fn rose_pine() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x504c68ff).into()), - border_variant: Some(rgba(0x504c68ff).into()), + border: Some(rgba(0x322f48ff).into()), + border_variant: Some(rgba(0x27243bff).into()), elevated_surface_background: Some(rgba(0x38354eff).into()), background: Some(rgba(0x38354eff).into()), panel_background: Some(rgba(0x28253cff).into()), @@ -725,8 +725,8 @@ pub fn rose_pine() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x423f55ff).into()), - border_variant: Some(rgba(0x423f55ff).into()), + border: Some(rgba(0x232132ff).into()), + border_variant: Some(rgba(0x1c1a29ff).into()), elevated_surface_background: Some(rgba(0x292739ff).into()), background: Some(rgba(0x292739ff).into()), panel_background: Some(rgba(0x1d1b2aff).into()), diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs index 9b6828d82f5c9ae18873582b552e0b31c5e0b1bb..38b6e046654481f6bc1d363bf9a1cd02131480d9 100644 --- a/crates/theme2/src/themes/sandcastle.rs +++ b/crates/theme2/src/themes/sandcastle.rs @@ -18,8 +18,8 @@ pub fn sandcastle() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x3d4350ff).into()), - border_variant: Some(rgba(0x3d4350ff).into()), + border: Some(rgba(0x313741ff).into()), + border_variant: Some(rgba(0x2a2f38ff).into()), elevated_surface_background: Some(rgba(0x333944ff).into()), background: Some(rgba(0x333944ff).into()), panel_background: Some(rgba(0x2b3039ff).into()), diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index 7aece1c6c47929e7551c14819c4af381fb05e056..a09ca0e0cc1a933d913bfb00ae5b22732c3a2db0 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -19,8 +19,8 @@ pub fn solarized() -> UserThemeFamily { appearance: Appearance::Light, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x9faaa8ff).into()), - border_variant: Some(rgba(0x9faaa8ff).into()), + border: Some(rgba(0xdcdacbff).into()), + border_variant: Some(rgba(0xf5eedbff).into()), elevated_surface_background: Some(rgba(0xcfd0c4ff).into()), background: Some(rgba(0xcfd0c4ff).into()), panel_background: Some(rgba(0xf3eddaff).into()), @@ -358,8 +358,8 @@ pub fn solarized() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x2b4f58ff).into()), - border_variant: Some(rgba(0x2b4f58ff).into()), + border: Some(rgba(0x063541ff).into()), + border_variant: Some(rgba(0x032f3bff).into()), elevated_surface_background: Some(rgba(0x083743ff).into()), background: Some(rgba(0x083743ff).into()), panel_background: Some(rgba(0x04313cff).into()), diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs index 6d36acd2edee5ba08c8873b704e141023081321a..c27d8369c3bca15aabf9742c1b17ea5879ef4707 100644 --- a/crates/theme2/src/themes/summercamp.rs +++ b/crates/theme2/src/themes/summercamp.rs @@ -18,8 +18,8 @@ pub fn summercamp() -> UserThemeFamily { appearance: Appearance::Dark, styles: UserThemeStylesRefinement { colors: ThemeColorsRefinement { - border: Some(rgba(0x312d21ff).into()), - border_variant: Some(rgba(0x312d21ff).into()), + border: Some(rgba(0x29251bff).into()), + border_variant: Some(rgba(0x221e15ff).into()), elevated_surface_background: Some(rgba(0x2a261cff).into()), background: Some(rgba(0x2a261cff).into()), panel_background: Some(rgba(0x231f16ff).into()), diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs index 2ce98a497bdb8a06e64d53d3015beca88be90bad..6543f216355ac3139f5b5dca2eee0861bc019fec 100644 --- a/crates/theme_importer/src/zed1/converter.rs +++ b/crates/theme_importer/src/zed1/converter.rs @@ -99,11 +99,9 @@ impl Zed1ThemeConverter { let scrollbar = &self.theme.editor.scrollbar; let terminal = &self.theme.terminal; - let title_bar_border = convert(title_bar.container.border.color); - Ok(ThemeColorsRefinement { - border: title_bar_border, - border_variant: title_bar_border, + border: convert(active_tab.container.border.color), + border_variant: convert(toolbar.container.border.color), background: convert(self.theme.workspace.background), elevated_surface_background: picker.container.background_color.map(zed1_color_to_hsla), title_bar_background: title_bar.container.background_color.map(zed1_color_to_hsla), From bdb89d470034fe41d4d6afda57375c3781dd8375 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 22 Dec 2023 21:25:31 -0500 Subject: [PATCH 3/6] Render tab bar tools as muted --- crates/workspace2/src/pane.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/workspace2/src/pane.rs b/crates/workspace2/src/pane.rs index 893c5222220339ad02d9c89a084159ba0b253465..bcf36dfe18e4d93d611d1403e68d0155979675d2 100644 --- a/crates/workspace2/src/pane.rs +++ b/crates/workspace2/src/pane.rs @@ -381,6 +381,7 @@ impl Pane { .child( IconButton::new("plus", Icon::Plus) .icon_size(IconSize::Small) + .icon_color(Color::Muted) .on_click(cx.listener(|pane, _, cx| { let menu = ContextMenu::build(cx, |menu, _| { menu.action("New File", NewFile.boxed_clone()) @@ -402,6 +403,7 @@ impl Pane { .child( IconButton::new("split", Icon::Split) .icon_size(IconSize::Small) + .icon_color(Color::Muted) .on_click(cx.listener(|pane, _, cx| { let menu = ContextMenu::build(cx, |menu, _| { menu.action("Split Right", SplitRight.boxed_clone()) @@ -422,6 +424,7 @@ impl Pane { let zoomed = pane.is_zoomed(); IconButton::new("toggle_zoom", Icon::Maximize) .icon_size(IconSize::Small) + .icon_color(Color::Muted) .selected(zoomed) .selected_icon(Icon::Minimize) .on_click(cx.listener(|pane, _, cx| { From 04d26353d281097b68556808812181c45927f1f5 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 22 Dec 2023 21:25:45 -0500 Subject: [PATCH 4/6] Adjust muted text colors --- crates/theme2/src/themes/andromeda.rs | 2 +- crates/theme2/src/themes/atelier.rs | 40 ++++++++++----------- crates/theme2/src/themes/ayu.rs | 6 ++-- crates/theme2/src/themes/gruvbox.rs | 12 +++---- crates/theme2/src/themes/one.rs | 4 +-- crates/theme2/src/themes/rose_pine.rs | 6 ++-- crates/theme2/src/themes/sandcastle.rs | 2 +- crates/theme2/src/themes/solarized.rs | 4 +-- crates/theme2/src/themes/summercamp.rs | 2 +- crates/theme_importer/src/zed1/converter.rs | 2 +- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs index a7cf529222375bb1ece74e412f070dc69937e731..fd61f9b482192048538a13ba6c110e85bcd8b389 100644 --- a/crates/theme2/src/themes/andromeda.rs +++ b/crates/theme2/src/themes/andromeda.rs @@ -26,7 +26,7 @@ pub fn andromeda() -> UserThemeFamily { element_hover: Some(rgba(0x2b2f3980).into()), element_selected: Some(rgba(0x383b4580).into()), text: Some(rgba(0xf7f7f8ff).into()), - text_muted: Some(rgba(0x474a53ff).into()), + text_muted: Some(rgba(0xaca8aeff).into()), text_placeholder: Some(rgba(0x474a53ff).into()), text_disabled: Some(rgba(0xf7f7f8ff).into()), text_accent: Some(rgba(0x11a793ff).into()), diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs index 3a1f94c8880537445d779d3bdcec2e0e957233e3..6c942d5b4c65b7187ea115f8133c98d3d83b5c28 100644 --- a/crates/theme2/src/themes/atelier.rs +++ b/crates/theme2/src/themes/atelier.rs @@ -27,7 +27,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x96958580).into()), element_selected: Some(rgba(0x8b8a7880).into()), text: Some(rgba(0x22221bff).into()), - text_muted: Some(rgba(0x878573ff).into()), + text_muted: Some(rgba(0x61604fff).into()), text_placeholder: Some(rgba(0x878573ff).into()), text_disabled: Some(rgba(0x22221bff).into()), text_accent: Some(rgba(0x38a166ff).into()), @@ -387,7 +387,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x665f5c80).into()), element_selected: Some(rgba(0x71696680).into()), text: Some(rgba(0xf1efeeff).into()), - text_muted: Some(rgba(0x766e6bff).into()), + text_muted: Some(rgba(0xa79f9dff).into()), text_placeholder: Some(rgba(0x766e6bff).into()), text_disabled: Some(rgba(0xf1efeeff).into()), text_accent: Some(rgba(0x417ee6ff).into()), @@ -747,7 +747,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x8b968e80).into()), element_selected: Some(rgba(0x7e8b8280).into()), text: Some(rgba(0x171c19ff).into()), - text_muted: Some(rgba(0x79877dff).into()), + text_muted: Some(rgba(0x546259ff).into()), text_placeholder: Some(rgba(0x79877dff).into()), text_disabled: Some(rgba(0x171c19ff).into()), text_accent: Some(rgba(0x488c90ff).into()), @@ -1107,7 +1107,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x56505e80).into()), element_selected: Some(rgba(0x605a6880).into()), text: Some(rgba(0xefecf4ff).into()), - text_muted: Some(rgba(0x655f6dff).into()), + text_muted: Some(rgba(0x898591ff).into()), text_placeholder: Some(rgba(0x655f6dff).into()), text_disabled: Some(rgba(0xefecf4ff).into()), text_accent: Some(rgba(0x576ddaff).into()), @@ -1467,7 +1467,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x5d5c4c80).into()), element_selected: Some(rgba(0x67665580).into()), text: Some(rgba(0xf4f3ecff).into()), - text_muted: Some(rgba(0x6c6b5aff).into()), + text_muted: Some(rgba(0x91907fff).into()), text_placeholder: Some(rgba(0x6c6b5aff).into()), text_disabled: Some(rgba(0xf4f3ecff).into()), text_accent: Some(rgba(0x37a166ff).into()), @@ -1827,7 +1827,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x5c648580).into()), element_selected: Some(rgba(0x666e8f80).into()), text: Some(rgba(0xf5f7ffff).into()), - text_muted: Some(rgba(0x6b7394ff).into()), + text_muted: Some(rgba(0x959bb2ff).into()), text_placeholder: Some(rgba(0x6b7394ff).into()), text_disabled: Some(rgba(0xf5f7ffff).into()), text_accent: Some(rgba(0x3e8fd0ff).into()), @@ -2187,7 +2187,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x9a9fb680).into()), element_selected: Some(rgba(0x8e94aa80).into()), text: Some(rgba(0x202746ff).into()), - text_muted: Some(rgba(0x898fa5ff).into()), + text_muted: Some(rgba(0x606889ff).into()), text_placeholder: Some(rgba(0x898fa5ff).into()), text_disabled: Some(rgba(0x202746ff).into()), text_accent: Some(rgba(0x3f8fd0ff).into()), @@ -2547,7 +2547,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x6c695c80).into()), element_selected: Some(rgba(0x77746480).into()), text: Some(rgba(0xfefbecff).into()), - text_muted: Some(rgba(0x7c7968ff).into()), + text_muted: Some(rgba(0xa4a08bff).into()), text_placeholder: Some(rgba(0x7c7968ff).into()), text_disabled: Some(rgba(0xfefbecff).into()), text_accent: Some(rgba(0x6684e0ff).into()), @@ -2907,7 +2907,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x5c6c5c80).into()), element_selected: Some(rgba(0x64776480).into()), text: Some(rgba(0xf4fbf4ff).into()), - text_muted: Some(rgba(0x687c68ff).into()), + text_muted: Some(rgba(0x8ba48bff).into()), text_placeholder: Some(rgba(0x687c68ff).into()), text_disabled: Some(rgba(0xf4fbf4ff).into()), text_accent: Some(rgba(0x3e62f4ff).into()), @@ -3267,7 +3267,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x8f8b9680).into()), element_selected: Some(rgba(0x837e8b80).into()), text: Some(rgba(0x19171cff).into()), - text_muted: Some(rgba(0x7e7987ff).into()), + text_muted: Some(rgba(0x5a5462ff).into()), text_placeholder: Some(rgba(0x7e7987ff).into()), text_disabled: Some(rgba(0x19171cff).into()), text_accent: Some(rgba(0x586ddaff).into()), @@ -3627,7 +3627,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x564e4e80).into()), element_selected: Some(rgba(0x60585880).into()), text: Some(rgba(0xf4ececff).into()), - text_muted: Some(rgba(0x655d5dff).into()), + text_muted: Some(rgba(0x898383ff).into()), text_placeholder: Some(rgba(0x655d5dff).into()), text_disabled: Some(rgba(0xf4ececff).into()), text_accent: Some(rgba(0x7272caff).into()), @@ -3987,7 +3987,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x675b6780).into()), element_selected: Some(rgba(0x72647280).into()), text: Some(rgba(0xf7f3f7ff).into()), - text_muted: Some(rgba(0x776977ff).into()), + text_muted: Some(rgba(0xa99aa9ff).into()), text_placeholder: Some(rgba(0x776977ff).into()), text_disabled: Some(rgba(0xf7f3f7ff).into()), text_accent: Some(rgba(0x526aebff).into()), @@ -4347,7 +4347,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x4f6b7880).into()), element_selected: Some(rgba(0x57768580).into()), text: Some(rgba(0xebf8ffff).into()), - text_muted: Some(rgba(0x5a7b8bff).into()), + text_muted: Some(rgba(0x7ca0b3ff).into()), text_placeholder: Some(rgba(0x5a7b8bff).into()), text_disabled: Some(rgba(0xebf8ffff).into()), text_accent: Some(rgba(0x277fadff).into()), @@ -4707,7 +4707,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0xaaa3a180).into()), element_selected: Some(rgba(0xa1999680).into()), text: Some(rgba(0x1b1918ff).into()), - text_muted: Some(rgba(0x9c9491ff).into()), + text_muted: Some(rgba(0x6a6360ff).into()), text_placeholder: Some(rgba(0x9c9491ff).into()), text_disabled: Some(rgba(0x1b1918ff).into()), text_accent: Some(rgba(0x417ee6ff).into()), @@ -5067,7 +5067,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0xa8a48e80).into()), element_selected: Some(rgba(0x9e9a8580).into()), text: Some(rgba(0x20201dff).into()), - text_muted: Some(rgba(0x999580ff).into()), + text_muted: Some(rgba(0x706d5fff).into()), text_placeholder: Some(rgba(0x999580ff).into()), text_disabled: Some(rgba(0x20201dff).into()), text_accent: Some(rgba(0x6784e0ff).into()), @@ -5427,7 +5427,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x8e898980).into()), element_selected: Some(rgba(0x837c7c80).into()), text: Some(rgba(0x1b1818ff).into()), - text_muted: Some(rgba(0x7e7777ff).into()), + text_muted: Some(rgba(0x5a5252ff).into()), text_placeholder: Some(rgba(0x7e7777ff).into()), text_disabled: Some(rgba(0x1b1818ff).into()), text_accent: Some(rgba(0x7372caff).into()), @@ -5787,7 +5787,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x8ea88e80).into()), element_selected: Some(rgba(0x859e8580).into()), text: Some(rgba(0x131513ff).into()), - text_muted: Some(rgba(0x809980ff).into()), + text_muted: Some(rgba(0x5f705fff).into()), text_placeholder: Some(rgba(0x809980ff).into()), text_disabled: Some(rgba(0x131513ff).into()), text_accent: Some(rgba(0x3f62f4ff).into()), @@ -6147,7 +6147,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x505e5580).into()), element_selected: Some(rgba(0x5a685f80).into()), text: Some(rgba(0xecf4eeff).into()), - text_muted: Some(rgba(0x5f6d64ff).into()), + text_muted: Some(rgba(0x859188ff).into()), text_placeholder: Some(rgba(0x5f6d64ff).into()), text_disabled: Some(rgba(0xecf4eeff).into()), text_accent: Some(rgba(0x478c90ff).into()), @@ -6507,7 +6507,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0xad9dad80).into()), element_selected: Some(rgba(0xa394a380).into()), text: Some(rgba(0x1b181bff).into()), - text_muted: Some(rgba(0x9e8f9eff).into()), + text_muted: Some(rgba(0x6b5e6bff).into()), text_placeholder: Some(rgba(0x9e8f9eff).into()), text_disabled: Some(rgba(0x1b181bff).into()), text_accent: Some(rgba(0x526aebff).into()), @@ -6867,7 +6867,7 @@ pub fn atelier() -> UserThemeFamily { element_hover: Some(rgba(0x80a4b680).into()), element_selected: Some(rgba(0x769aad80).into()), text: Some(rgba(0x161b1dff).into()), - text_muted: Some(rgba(0x7195a8ff).into()), + text_muted: Some(rgba(0x526f7dff).into()), text_placeholder: Some(rgba(0x7195a8ff).into()), text_disabled: Some(rgba(0x161b1dff).into()), text_accent: Some(rgba(0x277fadff).into()), diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs index deab32b8124920fc89a04f5b44da73c346437e51..bc2fe60b040a2ca939ea8a4d09ffbe54c1b98259 100644 --- a/crates/theme2/src/themes/ayu.rs +++ b/crates/theme2/src/themes/ayu.rs @@ -27,7 +27,7 @@ pub fn ayu() -> UserThemeFamily { element_hover: Some(rgba(0x3f404380).into()), element_selected: Some(rgba(0x50515280).into()), text: Some(rgba(0xbfbdb6ff).into()), - text_muted: Some(rgba(0x58595aff).into()), + text_muted: Some(rgba(0x8a8986ff).into()), text_placeholder: Some(rgba(0x58595aff).into()), text_disabled: Some(rgba(0xbfbdb6ff).into()), text_accent: Some(rgba(0x5ac2feff).into()), @@ -366,7 +366,7 @@ pub fn ayu() -> UserThemeFamily { element_hover: Some(rgba(0xcfd1d280).into()), element_selected: Some(rgba(0xc0c2c480).into()), text: Some(rgba(0x5c6166ff).into()), - text_muted: Some(rgba(0xb9bbbdff).into()), + text_muted: Some(rgba(0x8c8f93ff).into()), text_placeholder: Some(rgba(0xb9bbbdff).into()), text_disabled: Some(rgba(0x5c6166ff).into()), text_accent: Some(rgba(0x3b9ee5ff).into()), @@ -705,7 +705,7 @@ pub fn ayu() -> UserThemeFamily { element_hover: Some(rgba(0x53565d80).into()), element_selected: Some(rgba(0x63656a80).into()), text: Some(rgba(0xcccac2ff).into()), - text_muted: Some(rgba(0x6b6d71ff).into()), + text_muted: Some(rgba(0x9a9a98ff).into()), text_placeholder: Some(rgba(0x6b6d71ff).into()), text_disabled: Some(rgba(0xcccac2ff).into()), text_accent: Some(rgba(0x73cffeff).into()), diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs index 8512706fd4fd3d8c249fc94f4708880a896052fa..3db69b5a5463bc1cef83f3967d54ce27feec8295 100644 --- a/crates/theme2/src/themes/gruvbox.rs +++ b/crates/theme2/src/themes/gruvbox.rs @@ -27,7 +27,7 @@ pub fn gruvbox() -> UserThemeFamily { element_hover: Some(rgba(0xc9b99a80).into()), element_selected: Some(rgba(0xb5a68e80).into()), text: Some(rgba(0x282828ff).into()), - text_muted: Some(rgba(0xad9e87ff).into()), + text_muted: Some(rgba(0x5f5650ff).into()), text_placeholder: Some(rgba(0xad9e87ff).into()), text_disabled: Some(rgba(0x282828ff).into()), text_accent: Some(rgba(0x0b6678ff).into()), @@ -373,7 +373,7 @@ pub fn gruvbox() -> UserThemeFamily { element_hover: Some(rgba(0x5b534d80).into()), element_selected: Some(rgba(0x6e635a80).into()), text: Some(rgba(0xfbf1c7ff).into()), - text_muted: Some(rgba(0x776b61ff).into()), + text_muted: Some(rgba(0xc5b597ff).into()), text_placeholder: Some(rgba(0x776b61ff).into()), text_disabled: Some(rgba(0xfbf1c7ff).into()), text_accent: Some(rgba(0x83a598ff).into()), @@ -719,7 +719,7 @@ pub fn gruvbox() -> UserThemeFamily { element_hover: Some(rgba(0xc9b99a80).into()), element_selected: Some(rgba(0xb5a68e80).into()), text: Some(rgba(0x282828ff).into()), - text_muted: Some(rgba(0xad9e87ff).into()), + text_muted: Some(rgba(0x5f5650ff).into()), text_placeholder: Some(rgba(0xad9e87ff).into()), text_disabled: Some(rgba(0x282828ff).into()), text_accent: Some(rgba(0x0b6678ff).into()), @@ -1065,7 +1065,7 @@ pub fn gruvbox() -> UserThemeFamily { element_hover: Some(rgba(0x5b534d80).into()), element_selected: Some(rgba(0x6e635a80).into()), text: Some(rgba(0xfbf1c7ff).into()), - text_muted: Some(rgba(0x776b61ff).into()), + text_muted: Some(rgba(0xc5b597ff).into()), text_placeholder: Some(rgba(0x776b61ff).into()), text_disabled: Some(rgba(0xfbf1c7ff).into()), text_accent: Some(rgba(0x83a598ff).into()), @@ -1411,7 +1411,7 @@ pub fn gruvbox() -> UserThemeFamily { element_hover: Some(rgba(0xc9b99a80).into()), element_selected: Some(rgba(0xb5a68e80).into()), text: Some(rgba(0x282828ff).into()), - text_muted: Some(rgba(0xad9e87ff).into()), + text_muted: Some(rgba(0x5f5650ff).into()), text_placeholder: Some(rgba(0xad9e87ff).into()), text_disabled: Some(rgba(0x282828ff).into()), text_accent: Some(rgba(0x0b6678ff).into()), @@ -1757,7 +1757,7 @@ pub fn gruvbox() -> UserThemeFamily { element_hover: Some(rgba(0x5b534d80).into()), element_selected: Some(rgba(0x6e635a80).into()), text: Some(rgba(0xfbf1c7ff).into()), - text_muted: Some(rgba(0x776b61ff).into()), + text_muted: Some(rgba(0xc5b597ff).into()), text_placeholder: Some(rgba(0x776b61ff).into()), text_disabled: Some(rgba(0xfbf1c7ff).into()), text_accent: Some(rgba(0x83a598ff).into()), diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs index dcd90bf1afed088f984a0ed8ade8fd00c82f3bf8..7ea2bbea87b6fcc58344a440dba955b37b3a13be 100644 --- a/crates/theme2/src/themes/one.rs +++ b/crates/theme2/src/themes/one.rs @@ -27,7 +27,7 @@ pub fn one() -> UserThemeFamily { element_hover: Some(rgba(0xc9c9ca80).into()), element_selected: Some(rgba(0xafafaf80).into()), text: Some(rgba(0x383a41ff).into()), - text_muted: Some(rgba(0xa7a7a8ff).into()), + text_muted: Some(rgba(0x7f8188ff).into()), text_placeholder: Some(rgba(0xa7a7a8ff).into()), text_disabled: Some(rgba(0x383a41ff).into()), text_accent: Some(rgba(0x5c79e2ff).into()), @@ -373,7 +373,7 @@ pub fn one() -> UserThemeFamily { element_hover: Some(rgba(0x464b5780).into()), element_selected: Some(rgba(0x4f545e80).into()), text: Some(rgba(0xc8ccd4ff).into()), - text_muted: Some(rgba(0x545862ff).into()), + text_muted: Some(rgba(0x838994ff).into()), text_placeholder: Some(rgba(0x545862ff).into()), text_disabled: Some(rgba(0xc8ccd4ff).into()), text_accent: Some(rgba(0x74ade8ff).into()), diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs index a08618ca6a85657f0c1b9d51918e4b4121f06175..e63e8f2ad879a9dcfdac906f34124d229cf2db8a 100644 --- a/crates/theme2/src/themes/rose_pine.rs +++ b/crates/theme2/src/themes/rose_pine.rs @@ -27,7 +27,7 @@ pub fn rose_pine() -> UserThemeFamily { element_hover: Some(rgba(0xdcd6d580).into()), element_selected: Some(rgba(0xc1bac180).into()), text: Some(rgba(0x575279ff).into()), - text_muted: Some(rgba(0xb1abb5ff).into()), + text_muted: Some(rgba(0x706c8cff).into()), text_placeholder: Some(rgba(0xb1abb5ff).into()), text_disabled: Some(rgba(0x575279ff).into()), text_accent: Some(rgba(0x57949fff).into()), @@ -380,7 +380,7 @@ pub fn rose_pine() -> UserThemeFamily { element_hover: Some(rgba(0x504c6880).into()), element_selected: Some(rgba(0x45415d80).into()), text: Some(rgba(0xe0def4ff).into()), - text_muted: Some(rgba(0x3a3653ff).into()), + text_muted: Some(rgba(0x85819eff).into()), text_placeholder: Some(rgba(0x3a3653ff).into()), text_disabled: Some(rgba(0xe0def4ff).into()), text_accent: Some(rgba(0x9cced7ff).into()), @@ -733,7 +733,7 @@ pub fn rose_pine() -> UserThemeFamily { element_hover: Some(rgba(0x423f5580).into()), element_selected: Some(rgba(0x47445b80).into()), text: Some(rgba(0xe0def4ff).into()), - text_muted: Some(rgba(0x3b384fff).into()), + text_muted: Some(rgba(0x75718eff).into()), text_placeholder: Some(rgba(0x3b384fff).into()), text_disabled: Some(rgba(0xe0def4ff).into()), text_accent: Some(rgba(0x9cced7ff).into()), diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs index 38b6e046654481f6bc1d363bf9a1cd02131480d9..3e66ce97c1d0fb34defea641f669a69dafd1d923 100644 --- a/crates/theme2/src/themes/sandcastle.rs +++ b/crates/theme2/src/themes/sandcastle.rs @@ -26,7 +26,7 @@ pub fn sandcastle() -> UserThemeFamily { element_hover: Some(rgba(0x3d435080).into()), element_selected: Some(rgba(0x57535380).into()), text: Some(rgba(0xfdf4c1ff).into()), - text_muted: Some(rgba(0x645b54ff).into()), + text_muted: Some(rgba(0xa69782ff).into()), text_placeholder: Some(rgba(0x645b54ff).into()), text_disabled: Some(rgba(0xfdf4c1ff).into()), text_accent: Some(rgba(0x528b8bff).into()), diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs index a09ca0e0cc1a933d913bfb00ae5b22732c3a2db0..61c3fc8539473ca55ebdd2127cb80c605a3151e0 100644 --- a/crates/theme2/src/themes/solarized.rs +++ b/crates/theme2/src/themes/solarized.rs @@ -27,7 +27,7 @@ pub fn solarized() -> UserThemeFamily { element_hover: Some(rgba(0x9faaa880).into()), element_selected: Some(rgba(0x7f919480).into()), text: Some(rgba(0x002b36ff).into()), - text_muted: Some(rgba(0x788b8fff).into()), + text_muted: Some(rgba(0x34555eff).into()), text_placeholder: Some(rgba(0x788b8fff).into()), text_disabled: Some(rgba(0x002b36ff).into()), text_accent: Some(rgba(0x298bd1ff).into()), @@ -366,7 +366,7 @@ pub fn solarized() -> UserThemeFamily { element_hover: Some(rgba(0x2b4f5880).into()), element_selected: Some(rgba(0x566d7480).into()), text: Some(rgba(0xfdf6e3ff).into()), - text_muted: Some(rgba(0x5f757dff).into()), + text_muted: Some(rgba(0x93a1a1ff).into()), text_placeholder: Some(rgba(0x5f757dff).into()), text_disabled: Some(rgba(0xfdf6e3ff).into()), text_accent: Some(rgba(0x288bd1ff).into()), diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs index c27d8369c3bca15aabf9742c1b17ea5879ef4707..3540d824d2c5e01293260bbe1c60a9b00d8706ce 100644 --- a/crates/theme2/src/themes/summercamp.rs +++ b/crates/theme2/src/themes/summercamp.rs @@ -26,7 +26,7 @@ pub fn summercamp() -> UserThemeFamily { element_hover: Some(rgba(0x312d2180).into()), element_selected: Some(rgba(0x39342780).into()), text: Some(rgba(0xf8f5deff).into()), - text_muted: Some(rgba(0x3d382aff).into()), + text_muted: Some(rgba(0x736e55ff).into()), text_placeholder: Some(rgba(0x3d382aff).into()), text_disabled: Some(rgba(0xf8f5deff).into()), text_accent: Some(rgba(0x499befff).into()), diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs index 6543f216355ac3139f5b5dca2eee0861bc019fec..d2f156246e6e15595c2a650d17103c67076c433a 100644 --- a/crates/theme_importer/src/zed1/converter.rs +++ b/crates/theme_importer/src/zed1/converter.rs @@ -115,7 +115,7 @@ impl Zed1ThemeConverter { .background_color .map(zed1_color_to_hsla), text: convert(self.theme.collab_panel.channel_name.text.color), - text_muted: convert(active_tab.description.text.color), + text_muted: convert(tab_bar.pane_button.default_style().color), text_accent: convert(status_bar.panel_buttons.button.active_state().icon_color), text_disabled: convert(status_bar.panel_buttons.button.disabled_style().icon_color), text_placeholder: picker From 446c947ad1a20fd6916421aed72f7b91dd789845 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 22 Dec 2023 21:33:57 -0500 Subject: [PATCH 5/6] Render breadcrumb using muted colors --- crates/breadcrumbs2/src/breadcrumbs.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/breadcrumbs2/src/breadcrumbs.rs b/crates/breadcrumbs2/src/breadcrumbs.rs index 3b8ce1c6c5a34096a985d5ace4ff62f744ad870c..e579c8ded05d6532a2dcb1006da69f821044b667 100644 --- a/crates/breadcrumbs2/src/breadcrumbs.rs +++ b/crates/breadcrumbs2/src/breadcrumbs.rs @@ -53,12 +53,15 @@ impl Render for Breadcrumbs { }; let highlighted_segments = segments.into_iter().map(|segment| { + let mut text_style = cx.text_style(); + text_style.color = Color::Muted.color(cx); + StyledText::new(segment.text) - .with_highlights(&cx.text_style(), segment.highlights.unwrap_or_default()) + .with_highlights(&text_style, segment.highlights.unwrap_or_default()) .into_any() }); let breadcrumbs = Itertools::intersperse_with(highlighted_segments, || { - Label::new("›").into_any_element() + Label::new("›").color(Color::Muted).into_any_element() }); let editor = active_item From 14ed4a431644c8233f934d2b8f6d71f8332365a9 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 22 Dec 2023 21:36:20 -0500 Subject: [PATCH 6/6] Render project panel entries as muted, unless selected --- crates/project_panel2/src/project_panel.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/project_panel2/src/project_panel.rs b/crates/project_panel2/src/project_panel.rs index 2966c55f79b84ddbad7dcea046541f795bc0a18b..21a114c43c925dacdcfbe86da5b0af3f11960522 100644 --- a/crates/project_panel2/src/project_panel.rs +++ b/crates/project_panel2/src/project_panel.rs @@ -1372,7 +1372,11 @@ impl ProjectPanel { GitFileStatus::Modified => Color::Modified, GitFileStatus::Conflict => Color::Conflict, }) - .unwrap_or(Color::Default); + .unwrap_or(if is_selected { + Color::Default + } else { + Color::Muted + }); let file_name = details.filename.clone(); let icon = details.icon.clone();