diff --git a/assets/icons/at-sign.svg b/assets/icons/at_sign.svg similarity index 85% rename from assets/icons/at-sign.svg rename to assets/icons/at_sign.svg index 5adac38f62fb661e11d0f2e8f4ea17c94683aa5f..4cf8cd468f17e5cbcd012c6225543f6c4b027969 100644 --- a/assets/icons/at-sign.svg +++ b/assets/icons/at_sign.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/assets/icons/bell-off.svg b/assets/icons/bell_off.svg similarity index 100% rename from assets/icons/bell-off.svg rename to assets/icons/bell_off.svg diff --git a/assets/icons/bell-ring.svg b/assets/icons/bell_ring.svg similarity index 100% rename from assets/icons/bell-ring.svg rename to assets/icons/bell_ring.svg diff --git a/assets/icons/delete.svg b/assets/icons/delete.svg index 1068cb65f29a02cdf9b5f418239ed3069e4d1a3e..a7edbb615871745c0277b242b189a7e39135a4ed 100644 --- a/assets/icons/delete.svg +++ b/assets/icons/delete.svg @@ -1,4 +1 @@ - - - - + diff --git a/assets/icons/escape.svg b/assets/icons/escape.svg new file mode 100644 index 0000000000000000000000000000000000000000..00c772a2adfea0b43c10c5635c05649a00756de3 --- /dev/null +++ b/assets/icons/escape.svg @@ -0,0 +1 @@ + diff --git a/assets/icons/magic-wand.svg b/assets/icons/magic_wand.svg similarity index 100% rename from assets/icons/magic-wand.svg rename to assets/icons/magic_wand.svg diff --git a/assets/icons/mail-open.svg b/assets/icons/mail_open.svg similarity index 100% rename from assets/icons/mail-open.svg rename to assets/icons/mail_open.svg diff --git a/assets/icons/mic-mute.svg b/assets/icons/mic_mute.svg similarity index 100% rename from assets/icons/mic-mute.svg rename to assets/icons/mic_mute.svg diff --git a/assets/icons/page_down.svg b/assets/icons/page_down.svg new file mode 100644 index 0000000000000000000000000000000000000000..765f36b26a6f85669157f65d45128a604f8c695a --- /dev/null +++ b/assets/icons/page_down.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/icons/page_up.svg b/assets/icons/page_up.svg new file mode 100644 index 0000000000000000000000000000000000000000..f555165d2db9e85f8f2920fb7de258e7e64fb579 --- /dev/null +++ b/assets/icons/page_up.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/icons/return.svg b/assets/icons/return.svg index 683519c3066fef61cb256a103dcd219fe59ff9f1..16cfeeda2e3ad0e2acee6d7a594916e796fd2405 100644 --- a/assets/icons/return.svg +++ b/assets/icons/return.svg @@ -1,3 +1 @@ - - - + diff --git a/assets/icons/select-all.svg b/assets/icons/select_all.svg similarity index 100% rename from assets/icons/select-all.svg rename to assets/icons/select_all.svg diff --git a/assets/icons/space.svg b/assets/icons/space.svg new file mode 100644 index 0000000000000000000000000000000000000000..63718fb4aa1e1300621d29ca5bddd4e130c4796e --- /dev/null +++ b/assets/icons/space.svg @@ -0,0 +1 @@ + diff --git a/assets/icons/speaker-loud.svg b/assets/icons/speaker_loud.svg similarity index 100% rename from assets/icons/speaker-loud.svg rename to assets/icons/speaker_loud.svg diff --git a/assets/icons/speaker-off.svg b/assets/icons/speaker_off.svg similarity index 100% rename from assets/icons/speaker-off.svg rename to assets/icons/speaker_off.svg diff --git a/assets/icons/tab.svg b/assets/icons/tab.svg new file mode 100644 index 0000000000000000000000000000000000000000..49a3536bedd51ee70dd914710801bc9dbaf51616 --- /dev/null +++ b/assets/icons/tab.svg @@ -0,0 +1 @@ + diff --git a/crates/theme/src/themes/andromeda.rs b/crates/theme/src/themes/andromeda.rs index 327c6f668f7472f659cf72e4fe2f1300c496306b..e46e9cf9d0977bb527eb34d3a3697916a81b96a1 100644 --- a/crates/theme/src/themes/andromeda.rs +++ b/crates/theme/src/themes/andromeda.rs @@ -122,7 +122,7 @@ pub fn andromeda() -> UserThemeFamily { modified: Some(rgba(0xfee56dff).into()), modified_background: Some(rgba(0x5c5015ff).into()), modified_border: Some(rgba(0x796b26ff).into()), - predictive: Some(rgba(0x96df72ff).into()), + predictive: Some(rgba(0x315f70ff).into()), predictive_background: Some(rgba(0x194618ff).into()), predictive_border: Some(rgba(0x306129ff).into()), renamed: Some(rgba(0x11a793ff).into()), diff --git a/crates/theme/src/themes/atelier.rs b/crates/theme/src/themes/atelier.rs index 42756a8d3f4962f3861e3b1b8cd2e7702207b66b..75226c669bbe7aa32119d70f85fb63ccbf2e6190 100644 --- a/crates/theme/src/themes/atelier.rs +++ b/crates/theme/src/themes/atelier.rs @@ -123,7 +123,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xa59810ff).into()), modified_background: Some(rgba(0xf0e9d1ff).into()), modified_border: Some(rgba(0xe3d8adff).into()), - predictive: Some(rgba(0x7d9728ff).into()), + predictive: Some(rgba(0x879a72ff).into()), predictive_background: Some(rgba(0xe6e9d3ff).into()), predictive_border: Some(rgba(0xd2d8b1ff).into()), renamed: Some(rgba(0x38a166ff).into()), @@ -588,7 +588,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xc38419ff).into()), modified_background: Some(rgba(0x371d0dff).into()), modified_border: Some(rgba(0x4f2f12ff).into()), - predictive: Some(rgba(0x7b9727ff).into()), + predictive: Some(rgba(0x8f5b71ff).into()), predictive_background: Some(rgba(0x1d2110ff).into()), predictive_border: Some(rgba(0x2e3516ff).into()), renamed: Some(rgba(0x417ee6ff).into()), @@ -1053,7 +1053,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xa07e3cff).into()), modified_background: Some(rgba(0xeee4d5ff).into()), modified_border: Some(rgba(0xdfcfb6ff).into()), - predictive: Some(rgba(0x499963ff).into()), + predictive: Some(rgba(0x76958cff).into()), predictive_background: Some(rgba(0xdaeadeff).into()), predictive_border: Some(rgba(0xbedac5ff).into()), renamed: Some(rgba(0x488c90ff).into()), @@ -1518,7 +1518,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xa06e3bff).into()), modified_background: Some(rgba(0x231a12ff).into()), modified_border: Some(rgba(0x392a1aff).into()), - predictive: Some(rgba(0x2c9292ff).into()), + predictive: Some(rgba(0x625887ff).into()), predictive_background: Some(rgba(0x132020ff).into()), predictive_border: Some(rgba(0x1a3434ff).into()), renamed: Some(rgba(0x576ddaff).into()), @@ -1983,7 +1983,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xa59810ff).into()), modified_background: Some(rgba(0x25210dff).into()), modified_border: Some(rgba(0x3b3612ff).into()), - predictive: Some(rgba(0x7d9727ff).into()), + predictive: Some(rgba(0x5f724cff).into()), predictive_background: Some(rgba(0x1e2110ff).into()), predictive_border: Some(rgba(0x2f3516ff).into()), renamed: Some(rgba(0x37a166ff).into()), @@ -2448,7 +2448,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xc08b31ff).into()), modified_background: Some(rgba(0x311e11ff).into()), modified_border: Some(rgba(0x4b3218ff).into()), - predictive: Some(rgba(0xac973aff).into()), + predictive: Some(rgba(0x58709aff).into()), predictive_background: Some(rgba(0x252113ff).into()), predictive_border: Some(rgba(0x3d351bff).into()), renamed: Some(rgba(0x3e8fd0ff).into()), @@ -2913,7 +2913,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xc08b31ff).into()), modified_background: Some(rgba(0xf6e6d4ff).into()), modified_border: Some(rgba(0xeed4b3ff).into()), - predictive: Some(rgba(0xac973aff).into()), + predictive: Some(rgba(0x8599beff).into()), predictive_background: Some(rgba(0xf1e9d6ff).into()), predictive_border: Some(rgba(0xe4d8b7ff).into()), renamed: Some(rgba(0x3f8fd0ff).into()), @@ -3378,7 +3378,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xae9515ff).into()), modified_background: Some(rgba(0x2a200eff).into()), modified_border: Some(rgba(0x413513ff).into()), - predictive: Some(rgba(0x60ac3aff).into()), + predictive: Some(rgba(0x9c6262ff).into()), predictive_background: Some(rgba(0x1a2413ff).into()), predictive_border: Some(rgba(0x273c1bff).into()), renamed: Some(rgba(0x6684e0ff).into()), @@ -3843,7 +3843,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0x98981cff).into()), modified_background: Some(rgba(0x22210fff).into()), modified_border: Some(rgba(0x373614ff).into()), - predictive: Some(rgba(0x2ba32aff).into()), + predictive: Some(rgba(0x00788bff).into()), predictive_background: Some(rgba(0x142310ff).into()), predictive_border: Some(rgba(0x1b3917ff).into()), renamed: Some(rgba(0x3e62f4ff).into()), @@ -4308,7 +4308,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xa06e3cff).into()), modified_background: Some(rgba(0xeee0d5ff).into()), modified_border: Some(rgba(0xe0c9b5ff).into()), - predictive: Some(rgba(0x2c9292ff).into()), + predictive: Some(rgba(0x887fafff).into()), predictive_background: Some(rgba(0xd7e9e8ff).into()), predictive_border: Some(rgba(0xb9d7d6ff).into()), renamed: Some(rgba(0x586ddaff).into()), @@ -4773,7 +4773,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xa06e3bff).into()), modified_background: Some(rgba(0x231a12ff).into()), modified_border: Some(rgba(0x392a1aff).into()), - predictive: Some(rgba(0x4b8b8bff).into()), + predictive: Some(rgba(0x795369ff).into()), predictive_background: Some(rgba(0x161f1fff).into()), predictive_border: Some(rgba(0x203232ff).into()), renamed: Some(rgba(0x7272caff).into()), @@ -5238,7 +5238,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xbb8a36ff).into()), modified_background: Some(rgba(0x2d1e12ff).into()), modified_border: Some(rgba(0x463219ff).into()), - predictive: Some(rgba(0x918b3bff).into()), + predictive: Some(rgba(0x765990ff).into()), predictive_background: Some(rgba(0x211f12ff).into()), predictive_border: Some(rgba(0x34321bff).into()), renamed: Some(rgba(0x526aebff).into()), @@ -5703,7 +5703,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0x8a8a11ff).into()), modified_background: Some(rgba(0x201f0cff).into()), modified_border: Some(rgba(0x333211ff).into()), - predictive: Some(rgba(0x568c3bff).into()), + predictive: Some(rgba(0x427088ff).into()), predictive_background: Some(rgba(0x171f12ff).into()), predictive_border: Some(rgba(0x23321bff).into()), renamed: Some(rgba(0x277fadff).into()), @@ -6168,7 +6168,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xc3841aff).into()), modified_background: Some(rgba(0xf8e5d1ff).into()), modified_border: Some(rgba(0xf0d1adff).into()), - predictive: Some(rgba(0x7b9728ff).into()), + predictive: Some(rgba(0xbe899eff).into()), predictive_background: Some(rgba(0xe5e9d3ff).into()), predictive_border: Some(rgba(0xd1d8b1ff).into()), renamed: Some(rgba(0x417ee6ff).into()), @@ -6633,7 +6633,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xae9515ff).into()), modified_background: Some(rgba(0xf2e8d1ff).into()), modified_border: Some(rgba(0xe7d7aeff).into()), - predictive: Some(rgba(0x61ac3aff).into()), + predictive: Some(rgba(0xc88a8aff).into()), predictive_background: Some(rgba(0xe0eed6ff).into()), predictive_border: Some(rgba(0xc9e1b7ff).into()), renamed: Some(rgba(0x6784e0ff).into()), @@ -7098,7 +7098,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xa06e3cff).into()), modified_background: Some(rgba(0xeee0d5ff).into()), modified_border: Some(rgba(0xe0c9b5ff).into()), - predictive: Some(rgba(0x4c8b8bff).into()), + predictive: Some(rgba(0xa27a91ff).into()), predictive_background: Some(rgba(0xdae7e7ff).into()), predictive_border: Some(rgba(0xbfd4d4ff).into()), renamed: Some(rgba(0x7372caff).into()), @@ -7563,7 +7563,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0x98981dff).into()), modified_background: Some(rgba(0xede9d2ff).into()), modified_border: Some(rgba(0xddd8afff).into()), - predictive: Some(rgba(0x2ba32bff).into()), + predictive: Some(rgba(0x00a2b5ff).into()), predictive_background: Some(rgba(0xd9edd4ff).into()), predictive_border: Some(rgba(0xbbdeb2ff).into()), renamed: Some(rgba(0x3f62f4ff).into()), @@ -8028,7 +8028,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xa07e3bff).into()), modified_background: Some(rgba(0x231d12ff).into()), modified_border: Some(rgba(0x392e1aff).into()), - predictive: Some(rgba(0x489963ff).into()), + predictive: Some(rgba(0x506d66ff).into()), predictive_background: Some(rgba(0x162119ff).into()), predictive_border: Some(rgba(0x203626ff).into()), renamed: Some(rgba(0x478c90ff).into()), @@ -8493,7 +8493,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0xbb8a36ff).into()), modified_background: Some(rgba(0xf5e6d5ff).into()), modified_border: Some(rgba(0xebd3b5ff).into()), - predictive: Some(rgba(0x918b3cff).into()), + predictive: Some(rgba(0xa587bfff).into()), predictive_background: Some(rgba(0xeae6d6ff).into()), predictive_border: Some(rgba(0xd9d4b6ff).into()), renamed: Some(rgba(0x526aebff).into()), @@ -8958,7 +8958,7 @@ pub fn atelier() -> UserThemeFamily { modified: Some(rgba(0x8a8a11ff).into()), modified_background: Some(rgba(0xeae6d0ff).into()), modified_border: Some(rgba(0xd8d3abff).into()), - predictive: Some(rgba(0x578c3cff).into()), + predictive: Some(rgba(0x6a97b2ff).into()), predictive_background: Some(rgba(0xdde7d5ff).into()), predictive_border: Some(rgba(0xc2d5b6ff).into()), renamed: Some(rgba(0x277fadff).into()), diff --git a/crates/theme/src/themes/ayu.rs b/crates/theme/src/themes/ayu.rs index 63d8711d5702ef06647d46f0f927c1ab42477422..9029a01e25f52b5814d2dacd2061d5d15a219450 100644 --- a/crates/theme/src/themes/ayu.rs +++ b/crates/theme/src/themes/ayu.rs @@ -123,7 +123,7 @@ pub fn ayu() -> UserThemeFamily { modified: Some(rgba(0xfeb454ff).into()), modified_background: Some(rgba(0x572916ff).into()), modified_border: Some(rgba(0x754221ff).into()), - predictive: Some(rgba(0xaad84cff).into()), + predictive: Some(rgba(0x5b728cff).into()), predictive_background: Some(rgba(0x294113ff).into()), predictive_border: Some(rgba(0x405c1dff).into()), renamed: Some(rgba(0x5ac2feff).into()), @@ -567,7 +567,7 @@ pub fn ayu() -> UserThemeFamily { modified: Some(rgba(0xf1ae4aff).into()), modified_background: Some(rgba(0xffeedaff).into()), modified_border: Some(rgba(0xffe1beff).into()), - predictive: Some(rgba(0x86b305ff).into()), + predictive: Some(rgba(0x9eb9d3ff).into()), predictive_background: Some(rgba(0xe9efd2ff).into()), predictive_border: Some(rgba(0xd7e3aeff).into()), renamed: Some(rgba(0x3b9ee5ff).into()), @@ -1011,7 +1011,7 @@ pub fn ayu() -> UserThemeFamily { modified: Some(rgba(0xfed073ff).into()), modified_background: Some(rgba(0x584018ff).into()), modified_border: Some(rgba(0x765a29ff).into()), - predictive: Some(rgba(0xd5fe80ff).into()), + predictive: Some(rgba(0x6d839bff).into()), predictive_background: Some(rgba(0x426118ff).into()), predictive_border: Some(rgba(0x5d7e2cff).into()), renamed: Some(rgba(0x73cffeff).into()), diff --git a/crates/theme/src/themes/gruvbox.rs b/crates/theme/src/themes/gruvbox.rs index 7bc8ef806492d3d8432337556cb068e13e92097a..615c29dea805eb5336532dac4793a0ea2cba6cd6 100644 --- a/crates/theme/src/themes/gruvbox.rs +++ b/crates/theme/src/themes/gruvbox.rs @@ -123,7 +123,7 @@ pub fn gruvbox() -> UserThemeFamily { modified: Some(rgba(0xb57616ff).into()), modified_background: Some(rgba(0xf5e2d0ff).into()), modified_border: Some(rgba(0xebccabff).into()), - predictive: Some(rgba(0x797410ff).into()), + predictive: Some(rgba(0x7d9881ff).into()), predictive_background: Some(rgba(0xe5e1ceff).into()), predictive_border: Some(rgba(0xd1cba8ff).into()), renamed: Some(rgba(0x0b6678ff).into()), @@ -574,7 +574,7 @@ pub fn gruvbox() -> UserThemeFamily { modified: Some(rgba(0xf9bd30ff).into()), modified_background: Some(rgba(0x582f10ff).into()), modified_border: Some(rgba(0x754916ff).into()), - predictive: Some(rgba(0xb8bb27ff).into()), + predictive: Some(rgba(0x717363ff).into()), predictive_background: Some(rgba(0x332b11ff).into()), predictive_border: Some(rgba(0x4a4516ff).into()), renamed: Some(rgba(0x83a598ff).into()), @@ -1025,7 +1025,7 @@ pub fn gruvbox() -> UserThemeFamily { modified: Some(rgba(0xb57616ff).into()), modified_background: Some(rgba(0xf5e2d0ff).into()), modified_border: Some(rgba(0xebccabff).into()), - predictive: Some(rgba(0x797410ff).into()), + predictive: Some(rgba(0x7d9881ff).into()), predictive_background: Some(rgba(0xe5e1ceff).into()), predictive_border: Some(rgba(0xd1cba8ff).into()), renamed: Some(rgba(0x0b6678ff).into()), @@ -1476,7 +1476,7 @@ pub fn gruvbox() -> UserThemeFamily { modified: Some(rgba(0xf9bd30ff).into()), modified_background: Some(rgba(0x582f10ff).into()), modified_border: Some(rgba(0x754916ff).into()), - predictive: Some(rgba(0xb8bb27ff).into()), + predictive: Some(rgba(0x717363ff).into()), predictive_background: Some(rgba(0x332b11ff).into()), predictive_border: Some(rgba(0x4a4516ff).into()), renamed: Some(rgba(0x83a598ff).into()), @@ -1927,7 +1927,7 @@ pub fn gruvbox() -> UserThemeFamily { modified: Some(rgba(0xb57616ff).into()), modified_background: Some(rgba(0xf5e2d0ff).into()), modified_border: Some(rgba(0xebccabff).into()), - predictive: Some(rgba(0x797410ff).into()), + predictive: Some(rgba(0x7d9881ff).into()), predictive_background: Some(rgba(0xe5e1ceff).into()), predictive_border: Some(rgba(0xd1cba8ff).into()), renamed: Some(rgba(0x0b6678ff).into()), @@ -2378,7 +2378,7 @@ pub fn gruvbox() -> UserThemeFamily { modified: Some(rgba(0xf9bd30ff).into()), modified_background: Some(rgba(0x582f10ff).into()), modified_border: Some(rgba(0x754916ff).into()), - predictive: Some(rgba(0xb8bb27ff).into()), + predictive: Some(rgba(0x717363ff).into()), predictive_background: Some(rgba(0x332b11ff).into()), predictive_border: Some(rgba(0x4a4516ff).into()), renamed: Some(rgba(0x83a598ff).into()), diff --git a/crates/theme/src/themes/one.rs b/crates/theme/src/themes/one.rs index 0447306a2cb0f1d873655c333dda3a3032269eeb..12fd7e9b663dbc9879a6b3110cd9e55b2a975e68 100644 --- a/crates/theme/src/themes/one.rs +++ b/crates/theme/src/themes/one.rs @@ -123,7 +123,7 @@ pub fn one() -> UserThemeFamily { modified: Some(rgba(0xdec184ff).into()), modified_background: Some(rgba(0xfaf2e6ff).into()), modified_border: Some(rgba(0xf5e8d2ff).into()), - predictive: Some(rgba(0x669f59ff).into()), + predictive: Some(rgba(0x9c9fc7ff).into()), predictive_background: Some(rgba(0xe0ebdcff).into()), predictive_border: Some(rgba(0xc8dcc1ff).into()), renamed: Some(rgba(0x5c79e2ff).into()), @@ -574,7 +574,7 @@ pub fn one() -> UserThemeFamily { modified: Some(rgba(0xdec184ff).into()), modified_background: Some(rgba(0x41331dff).into()), modified_border: Some(rgba(0x5d4c2fff).into()), - predictive: Some(rgba(0xa1c181ff).into()), + predictive: Some(rgba(0x5b6b88ff).into()), predictive_background: Some(rgba(0x222e1dff).into()), predictive_border: Some(rgba(0x38482fff).into()), renamed: Some(rgba(0x74ade8ff).into()), diff --git a/crates/theme/src/themes/rose_pine.rs b/crates/theme/src/themes/rose_pine.rs index c5c57342ec0104db28ec9fc7007170176c7ea9d0..966d6e5e625b5ffa5dbb9c4ae1ef5d0ff3e2aaec 100644 --- a/crates/theme/src/themes/rose_pine.rs +++ b/crates/theme/src/themes/rose_pine.rs @@ -123,7 +123,7 @@ pub fn rose_pine() -> UserThemeFamily { modified: Some(rgba(0xe99d35ff).into()), modified_background: Some(rgba(0xffebd6ff).into()), modified_border: Some(rgba(0xffdab7ff).into()), - predictive: Some(rgba(0x3eaa8eff).into()), + predictive: Some(rgba(0xa2acbeff).into()), predictive_background: Some(rgba(0xdbeee7ff).into()), predictive_border: Some(rgba(0xbee0d5ff).into()), renamed: Some(rgba(0x57949fff).into()), @@ -581,7 +581,7 @@ pub fn rose_pine() -> UserThemeFamily { modified: Some(rgba(0xf5c177ff).into()), modified_background: Some(rgba(0x50341aff).into()), modified_border: Some(rgba(0x6d4d2bff).into()), - predictive: Some(rgba(0x5dc2a3ff).into()), + predictive: Some(rgba(0x516b83ff).into()), predictive_background: Some(rgba(0x182e23ff).into()), predictive_border: Some(rgba(0x254839ff).into()), renamed: Some(rgba(0x9cced7ff).into()), @@ -1039,7 +1039,7 @@ pub fn rose_pine() -> UserThemeFamily { modified: Some(rgba(0xf5c177ff).into()), modified_background: Some(rgba(0x50341aff).into()), modified_border: Some(rgba(0x6d4d2bff).into()), - predictive: Some(rgba(0x5dc2a3ff).into()), + predictive: Some(rgba(0x556b81ff).into()), predictive_background: Some(rgba(0x182e23ff).into()), predictive_border: Some(rgba(0x254839ff).into()), renamed: Some(rgba(0x9cced7ff).into()), diff --git a/crates/theme/src/themes/sandcastle.rs b/crates/theme/src/themes/sandcastle.rs index 68bff2840f5cd074560305ddcac2ef51b99b33e0..9ca7a9dff2bb3483ec737d9b146985ae4fdaa965 100644 --- a/crates/theme/src/themes/sandcastle.rs +++ b/crates/theme/src/themes/sandcastle.rs @@ -122,7 +122,7 @@ pub fn sandcastle() -> UserThemeFamily { modified: Some(rgba(0xa07e3bff).into()), modified_background: Some(rgba(0x231d12ff).into()), modified_border: Some(rgba(0x392e1aff).into()), - predictive: Some(rgba(0x83a598ff).into()), + predictive: Some(rgba(0x5c6152ff).into()), predictive_background: Some(rgba(0x1e2321ff).into()), predictive_border: Some(rgba(0x303a36ff).into()), renamed: Some(rgba(0x528b8bff).into()), diff --git a/crates/theme/src/themes/solarized.rs b/crates/theme/src/themes/solarized.rs index 93bda797383be5b6eaf833e1776c383409850e7c..945d99ed5bd5da5eaa012fabf5527a6e25b722fd 100644 --- a/crates/theme/src/themes/solarized.rs +++ b/crates/theme/src/themes/solarized.rs @@ -123,7 +123,7 @@ pub fn solarized() -> UserThemeFamily { modified: Some(rgba(0xb58904ff).into()), modified_background: Some(rgba(0xf5e6d0ff).into()), modified_border: Some(rgba(0xebd3aaff).into()), - predictive: Some(rgba(0x859904ff).into()), + predictive: Some(rgba(0x679aafff).into()), predictive_background: Some(rgba(0xe9ead0ff).into()), predictive_border: Some(rgba(0xd6d9abff).into()), renamed: Some(rgba(0x298bd1ff).into()), @@ -567,7 +567,7 @@ pub fn solarized() -> UserThemeFamily { modified: Some(rgba(0xb58903ff).into()), modified_background: Some(rgba(0x2f1e0cff).into()), modified_border: Some(rgba(0x473110ff).into()), - predictive: Some(rgba(0x859904ff).into()), + predictive: Some(rgba(0x40728bff).into()), predictive_background: Some(rgba(0x1f210cff).into()), predictive_border: Some(rgba(0x323610ff).into()), renamed: Some(rgba(0x288bd1ff).into()), diff --git a/crates/theme/src/themes/summercamp.rs b/crates/theme/src/themes/summercamp.rs index 0dd28f26283ca0eb6a7d595aa0bebc8399696ce6..963608d5db1a4a5d5fffcda73bbb1de267a27761 100644 --- a/crates/theme/src/themes/summercamp.rs +++ b/crates/theme/src/themes/summercamp.rs @@ -122,7 +122,7 @@ pub fn summercamp() -> UserThemeFamily { modified: Some(rgba(0xf1fe29ff).into()), modified_background: Some(rgba(0x556305ff).into()), modified_border: Some(rgba(0x727f0aff).into()), - predictive: Some(rgba(0x5dea5aff).into()), + predictive: Some(rgba(0x79434bff).into()), predictive_background: Some(rgba(0x0a4d13ff).into()), predictive_border: Some(rgba(0x1a6a20ff).into()), renamed: Some(rgba(0x499befff).into()), diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs index 913dfbf7bb8194c60b801b78fb9ab4dad72c7fa7..45563971d17ceabdeecdb5fbfe31d0cb46d5451a 100644 --- a/crates/theme_importer/src/zed1/converter.rs +++ b/crates/theme_importer/src/zed1/converter.rs @@ -117,7 +117,11 @@ impl Zed1ThemeConverter { .or(convert(lowest.accent.default.foreground)), hint_background: convert(lowest.accent.default.background), hint_border: convert(lowest.accent.default.border), - predictive: convert(lowest.positive.default.foreground), + predictive: editor + .suggestion + .color + .map(zed1_color_to_hsla) + .or(convert(lowest.positive.default.foreground)), predictive_background: convert(lowest.positive.default.background), predictive_border: convert(lowest.positive.default.border), conflict: convert(lowest.warning.default.foreground), diff --git a/crates/ui/src/components/icon.rs b/crates/ui/src/components/icon.rs index df1c82bb666d2a20084387f80a5896f73266d598..f1916d3dce2409101fc93383af08560892a92f74 100644 --- a/crates/ui/src/components/icon.rs +++ b/crates/ui/src/components/icon.rs @@ -24,10 +24,10 @@ impl IconSize { #[derive(Debug, PartialEq, Copy, Clone, EnumIter)] pub enum Icon { Ai, - ArrowLeft, - ArrowUp, ArrowDown, + ArrowLeft, ArrowRight, + ArrowUp, ArrowUpRight, AtSign, AudioOff, @@ -39,25 +39,28 @@ pub enum Icon { Bolt, CaseSensitive, Check, - Copy, ChevronDown, ChevronLeft, ChevronRight, ChevronUp, Close, Collab, + Command, + Control, Copilot, - CopilotInit, - CopilotError, CopilotDisabled, + CopilotError, + CopilotInit, + Copy, Dash, Delete, Disconnected, Ellipsis, Envelope, - ExternalLink, + Escape, ExclamationTriangle, Exit, + ExternalLink, File, FileDoc, FileGeneric, @@ -78,30 +81,32 @@ pub enum Icon { MagnifyingGlass, MailOpen, Maximize, - Minimize, Menu, MessageBubbles, Mic, MicMute, + Minimize, + Option, + PageDown, + PageUp, Plus, Public, Quote, Replace, ReplaceAll, ReplaceNext, + Return, Screen, SelectAll, - Split, + Shift, Snip, + Space, + Split, + Tab, Terminal, + Update, WholeWord, XCircle, - Command, - Control, - Shift, - Option, - Return, - Update, ZedXCopilot, } @@ -109,40 +114,43 @@ impl Icon { pub fn path(self) -> &'static str { match self { Icon::Ai => "icons/ai.svg", + Icon::ArrowDown => "icons/arrow_down.svg", Icon::ArrowLeft => "icons/arrow_left.svg", Icon::ArrowRight => "icons/arrow_right.svg", Icon::ArrowUp => "icons/arrow_up.svg", - Icon::ArrowDown => "icons/arrow_down.svg", Icon::ArrowUpRight => "icons/arrow_up_right.svg", - Icon::AtSign => "icons/at-sign.svg", - Icon::AudioOff => "icons/speaker-off.svg", + Icon::AtSign => "icons/at_sign.svg", + Icon::AudioOff => "icons/speaker_off.svg", Icon::AudioOn => "icons/speaker-loud.svg", Icon::Backspace => "icons/backspace.svg", Icon::Bell => "icons/bell.svg", - Icon::BellOff => "icons/bell-off.svg", - Icon::BellRing => "icons/bell-ring.svg", + Icon::BellOff => "icons/bell_off.svg", + Icon::BellRing => "icons/bell_ring.svg", Icon::Bolt => "icons/bolt.svg", Icon::CaseSensitive => "icons/case_insensitive.svg", Icon::Check => "icons/check.svg", - Icon::Copy => "icons/copy.svg", Icon::ChevronDown => "icons/chevron_down.svg", Icon::ChevronLeft => "icons/chevron_left.svg", Icon::ChevronRight => "icons/chevron_right.svg", Icon::ChevronUp => "icons/chevron_up.svg", Icon::Close => "icons/x.svg", Icon::Collab => "icons/user_group_16.svg", + Icon::Command => "icons/command.svg", + Icon::Control => "icons/control.svg", Icon::Copilot => "icons/copilot.svg", - Icon::CopilotInit => "icons/copilot_init.svg", - Icon::CopilotError => "icons/copilot_error.svg", Icon::CopilotDisabled => "icons/copilot_disabled.svg", + Icon::CopilotError => "icons/copilot_error.svg", + Icon::CopilotInit => "icons/copilot_init.svg", + Icon::Copy => "icons/copy.svg", Icon::Dash => "icons/dash.svg", Icon::Delete => "icons/delete.svg", Icon::Disconnected => "icons/disconnected.svg", Icon::Ellipsis => "icons/ellipsis.svg", Icon::Envelope => "icons/feedback.svg", + Icon::Escape => "icons/escape.svg", Icon::ExclamationTriangle => "icons/warning.svg", - Icon::ExternalLink => "icons/external_link.svg", Icon::Exit => "icons/exit.svg", + Icon::ExternalLink => "icons/external_link.svg", Icon::File => "icons/file.svg", Icon::FileDoc => "icons/file_icons/book.svg", Icon::FileGeneric => "icons/file_icons/file.svg", @@ -159,34 +167,36 @@ impl Icon { Icon::Hash => "icons/hash.svg", Icon::InlayHint => "icons/inlay_hint.svg", Icon::Link => "icons/link.svg", - Icon::MagicWand => "icons/magic-wand.svg", + Icon::MagicWand => "icons/magic_wand.svg", Icon::MagnifyingGlass => "icons/magnifying_glass.svg", - Icon::MailOpen => "icons/mail-open.svg", + Icon::MailOpen => "icons/mail_open.svg", Icon::Maximize => "icons/maximize.svg", - Icon::Minimize => "icons/minimize.svg", Icon::Menu => "icons/menu.svg", Icon::MessageBubbles => "icons/conversations.svg", Icon::Mic => "icons/mic.svg", - Icon::MicMute => "icons/mic-mute.svg", + Icon::MicMute => "icons/mic_mute.svg", + Icon::Minimize => "icons/minimize.svg", + Icon::Option => "icons/option.svg", + Icon::PageDown => "icons/page_down.svg", + Icon::PageUp => "icons/page_up.svg", Icon::Plus => "icons/plus.svg", Icon::Public => "icons/public.svg", Icon::Quote => "icons/quote.svg", Icon::Replace => "icons/replace.svg", Icon::ReplaceAll => "icons/replace_all.svg", Icon::ReplaceNext => "icons/replace_next.svg", + Icon::Return => "icons/return.svg", Icon::Screen => "icons/desktop.svg", - Icon::SelectAll => "icons/select-all.svg", - Icon::Split => "icons/split.svg", + Icon::SelectAll => "icons/select_all.svg", + Icon::Shift => "icons/shift.svg", Icon::Snip => "icons/snip.svg", + Icon::Space => "icons/space.svg", + Icon::Split => "icons/split.svg", + Icon::Tab => "icons/tab.svg", Icon::Terminal => "icons/terminal.svg", + Icon::Update => "icons/update.svg", Icon::WholeWord => "icons/word_search.svg", Icon::XCircle => "icons/error.svg", - Icon::Command => "icons/command.svg", - Icon::Control => "icons/control.svg", - Icon::Shift => "icons/shift.svg", - Icon::Option => "icons/option.svg", - Icon::Return => "icons/return.svg", - Icon::Update => "icons/update.svg", Icon::ZedXCopilot => "icons/zed_x_copilot.svg", } } diff --git a/crates/ui/src/components/keybinding.rs b/crates/ui/src/components/keybinding.rs index a07ce1116cebc9cf5bfb2be9a0c8948196be3e02..671f9810831649f8f83dac2e25f88f2223febc40 100644 --- a/crates/ui/src/components/keybinding.rs +++ b/crates/ui/src/components/keybinding.rs @@ -21,9 +21,9 @@ impl RenderOnce for KeyBinding { h_stack() .flex_none() .gap_0p5() - .bg(cx.theme().colors().element_background) .p_0p5() .rounded_sm() + .text_color(cx.theme().colors().text_muted) .when(keystroke.modifiers.function, |el| el.child(Key::new("fn"))) .when(keystroke.modifiers.control, |el| { el.child(KeyIcon::new(Icon::Control)) @@ -70,6 +70,13 @@ impl KeyBinding { "down" => Some(Icon::ArrowDown), "backspace" => Some(Icon::Backspace), "delete" => Some(Icon::Delete), + "return" => Some(Icon::Return), + "enter" => Some(Icon::Return), + "tab" => Some(Icon::Tab), + "space" => Some(Icon::Space), + "escape" => Some(Icon::Escape), + "pagedown" => Some(Icon::PageDown), + "pageup" => Some(Icon::PageUp), _ => None, } } @@ -100,7 +107,7 @@ impl RenderOnce for Key { .h(rems(14. / 16.)) .text_ui() .line_height(relative(1.)) - .text_color(cx.theme().colors().text) + .text_color(cx.theme().colors().text_muted) .child(self.key.clone()) } } @@ -118,9 +125,11 @@ pub struct KeyIcon { impl RenderOnce for KeyIcon { fn render(self, _cx: &mut WindowContext) -> impl IntoElement { - div() - .w(rems(14. / 16.)) - .child(IconElement::new(self.icon).size(IconSize::Small)) + div().w(rems(14. / 16.)).child( + IconElement::new(self.icon) + .size(IconSize::Small) + .color(Color::Muted), + ) } }