diff --git a/assets/themes/catppuccin-frappe.json b/assets/themes/catppuccin-frappe.json index 6804db9..e24cb26 100644 --- a/assets/themes/catppuccin-frappe.json +++ b/assets/themes/catppuccin-frappe.json @@ -28,31 +28,31 @@ "icon_accent": "#8caaee", "element_foreground": "#232634", "element_background": "#8caaee", - "element_hover": "#8caaeee6", + "element_hover": "#babbf1", "element_active": "#7e99d6", "element_selected": "#7088bf", "element_disabled": "#8caaee4d", "secondary_foreground": "#7088bf", "secondary_background": "#292c3c", - "secondary_hover": "#8caaee1a", + "secondary_hover": "#8caaee33", "secondary_active": "#232634", "secondary_selected": "#232634", "secondary_disabled": "#8caaee4d", "danger_foreground": "#232634", "danger_background": "#e78284", - "danger_hover": "#e782841a", + "danger_hover": "#ea999c", "danger_active": "#d07576", "danger_selected": "#b96869", "danger_disabled": "#e782844d", "warning_foreground": "#232634", "warning_background": "#e5c890", - "warning_hover": "#e5c8901a", + "warning_hover": "#ef9f76", "warning_active": "#ceb482", "warning_selected": "#b7a074", "warning_disabled": "#e5c8904d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#414559", - "ghost_element_hover": "#c6d0f51a", + "ghost_element_hover": "#c6d0f533", "ghost_element_active": "#51576d", "ghost_element_selected": "#51576d", "ghost_element_disabled": "#c6d0f50d", @@ -60,9 +60,9 @@ "tab_inactive_foreground": "#b5bfe2", "tab_active_background": "#303446", "tab_active_foreground": "#c6d0f5", - "tab_hover_foreground": "#8caaee", + "tab_hover_foreground": "#babbf1", "scrollbar_thumb_background": "#c6d0f533", - "scrollbar_thumb_hover_background": "#c6d0f54d", + "scrollbar_thumb_hover_background": "#c6d0f580", "scrollbar_thumb_border": "#00000000", "scrollbar_track_background": "#00000000", "scrollbar_track_border": "#51576d", @@ -95,31 +95,31 @@ "icon_accent": "#8caaee", "element_foreground": "#232634", "element_background": "#8caaee", - "element_hover": "#8caaeee6", + "element_hover": "#babbf1", "element_active": "#7e99d6", "element_selected": "#7088bf", "element_disabled": "#8caaee4d", "secondary_foreground": "#7088bf", "secondary_background": "#292c3c", - "secondary_hover": "#8caaee1a", + "secondary_hover": "#8caaee33", "secondary_active": "#232634", "secondary_selected": "#232634", "secondary_disabled": "#8caaee4d", "danger_foreground": "#232634", "danger_background": "#e78284", - "danger_hover": "#e782841a", + "danger_hover": "#ea999c", "danger_active": "#d07576", "danger_selected": "#b96869", "danger_disabled": "#e782844d", "warning_foreground": "#232634", "warning_background": "#e5c890", - "warning_hover": "#e5c8901a", + "warning_hover": "#ef9f76", "warning_active": "#ceb482", "warning_selected": "#b7a074", "warning_disabled": "#e5c8904d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#414559", - "ghost_element_hover": "#c6d0f51a", + "ghost_element_hover": "#c6d0f533", "ghost_element_active": "#51576d", "ghost_element_selected": "#51576d", "ghost_element_disabled": "#c6d0f50d", @@ -127,9 +127,9 @@ "tab_inactive_foreground": "#b5bfe2", "tab_active_background": "#303446", "tab_active_foreground": "#c6d0f5", - "tab_hover_foreground": "#8caaee", + "tab_hover_foreground": "#babbf1", "scrollbar_thumb_background": "#c6d0f533", - "scrollbar_thumb_hover_background": "#c6d0f54d", + "scrollbar_thumb_hover_background": "#c6d0f580", "scrollbar_thumb_border": "#00000000", "scrollbar_track_background": "#00000000", "scrollbar_track_border": "#51576d", diff --git a/assets/themes/catppuccin-latte.json b/assets/themes/catppuccin-latte.json index 45af458..2b78530 100644 --- a/assets/themes/catppuccin-latte.json +++ b/assets/themes/catppuccin-latte.json @@ -28,31 +28,31 @@ "icon_accent": "#1e66f5", "element_foreground": "#eff1f5", "element_background": "#1e66f5", - "element_hover": "#1e66f5e6", + "element_hover": "#8839ef", "element_active": "#1c5ce0", "element_selected": "#1a52cc", "element_disabled": "#1e66f54d", "secondary_foreground": "#1a52cc", "secondary_background": "#e6e9ef", - "secondary_hover": "#1e66f51a", + "secondary_hover": "#8839ef33", "secondary_active": "#dce0e8", "secondary_selected": "#dce0e8", "secondary_disabled": "#1e66f54d", "danger_foreground": "#eff1f5", "danger_background": "#d20f39", - "danger_hover": "#d20f391a", + "danger_hover": "#e64553", "danger_active": "#bd0d33", "danger_selected": "#a80b2d", "danger_disabled": "#d20f394d", "warning_foreground": "#4c4f69", "warning_background": "#df8e1d", - "warning_hover": "#df8e1d1a", + "warning_hover": "#fe640b", "warning_active": "#c9801a", "warning_selected": "#b47217", "warning_disabled": "#df8e1d4d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#ccd0da", - "ghost_element_hover": "#4c4f691a", + "ghost_element_hover": "#4c4f6933", "ghost_element_active": "#bcc0cc", "ghost_element_selected": "#bcc0cc", "ghost_element_disabled": "#4c4f690d", @@ -60,9 +60,9 @@ "tab_inactive_foreground": "#5c5f77", "tab_active_background": "#eff1f5", "tab_active_foreground": "#4c4f69", - "tab_hover_foreground": "#1e66f5", + "tab_hover_foreground": "#8839ef", "scrollbar_thumb_background": "#4c4f6933", - "scrollbar_thumb_hover_background": "#4c4f694d", + "scrollbar_thumb_hover_background": "#4c4f6980", "scrollbar_thumb_border": "#00000000", "scrollbar_track_background": "#00000000", "scrollbar_track_border": "#bcc0cc", @@ -95,31 +95,31 @@ "icon_accent": "#1e66f5", "element_foreground": "#eff1f5", "element_background": "#1e66f5", - "element_hover": "#1e66f5e6", + "element_hover": "#8839ef", "element_active": "#1c5ce0", "element_selected": "#1a52cc", "element_disabled": "#1e66f54d", "secondary_foreground": "#1a52cc", "secondary_background": "#e6e9ef", - "secondary_hover": "#1e66f51a", + "secondary_hover": "#8839ef33", "secondary_active": "#dce0e8", "secondary_selected": "#dce0e8", "secondary_disabled": "#1e66f54d", "danger_foreground": "#eff1f5", "danger_background": "#d20f39", - "danger_hover": "#d20f391a", + "danger_hover": "#e64553", "danger_active": "#bd0d33", "danger_selected": "#a80b2d", "danger_disabled": "#d20f394d", "warning_foreground": "#4c4f69", "warning_background": "#df8e1d", - "warning_hover": "#df8e1d1a", + "warning_hover": "#fe640b", "warning_active": "#c9801a", "warning_selected": "#b47217", "warning_disabled": "#df8e1d4d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#ccd0da", - "ghost_element_hover": "#4c4f691a", + "ghost_element_hover": "#4c4f6933", "ghost_element_active": "#bcc0cc", "ghost_element_selected": "#bcc0cc", "ghost_element_disabled": "#4c4f690d", @@ -127,9 +127,9 @@ "tab_inactive_foreground": "#5c5f77", "tab_active_background": "#eff1f5", "tab_active_foreground": "#4c4f69", - "tab_hover_foreground": "#1e66f5", + "tab_hover_foreground": "#8839ef", "scrollbar_thumb_background": "#4c4f6933", - "scrollbar_thumb_hover_background": "#4c4f694d", + "scrollbar_thumb_hover_background": "#4c4f6980", "scrollbar_thumb_border": "#00000000", "scrollbar_track_background": "#00000000", "scrollbar_track_border": "#bcc0cc", diff --git a/assets/themes/catppuccin-macchiato.json b/assets/themes/catppuccin-macchiato.json index 7d23d59..a4c56b7 100644 --- a/assets/themes/catppuccin-macchiato.json +++ b/assets/themes/catppuccin-macchiato.json @@ -28,31 +28,31 @@ "icon_accent": "#8aadf4", "element_foreground": "#181926", "element_background": "#8aadf4", - "element_hover": "#8aadf4e6", + "element_hover": "#b7bdf8", "element_active": "#7c9cdc", "element_selected": "#6e8bc5", "element_disabled": "#8aadf44d", "secondary_foreground": "#6e8bc5", "secondary_background": "#1e2030", - "secondary_hover": "#8aadf41a", + "secondary_hover": "#8aadf433", "secondary_active": "#181926", "secondary_selected": "#181926", "secondary_disabled": "#8aadf44d", "danger_foreground": "#181926", "danger_background": "#ed8796", - "danger_hover": "#ed87961a", + "danger_hover": "#ee99a0", "danger_active": "#d57a87", "danger_selected": "#be6d78", "danger_disabled": "#ed87964d", "warning_foreground": "#181926", "warning_background": "#eed49f", - "warning_hover": "#eed49f1a", + "warning_hover": "#f5a97f", "warning_active": "#d6bf8f", "warning_selected": "#beaa7f", "warning_disabled": "#eed49f4d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#363a4f", - "ghost_element_hover": "#cad3f51a", + "ghost_element_hover": "#cad3f533", "ghost_element_active": "#494d64", "ghost_element_selected": "#494d64", "ghost_element_disabled": "#cad3f50d", @@ -60,9 +60,9 @@ "tab_inactive_foreground": "#b8c0e0", "tab_active_background": "#24273a", "tab_active_foreground": "#cad3f5", - "tab_hover_foreground": "#8aadf4", + "tab_hover_foreground": "#b7bdf8", "scrollbar_thumb_background": "#cad3f533", - "scrollbar_thumb_hover_background": "#cad3f54d", + "scrollbar_thumb_hover_background": "#cad3f580", "scrollbar_thumb_border": "#00000000", "scrollbar_track_background": "#00000000", "scrollbar_track_border": "#494d64", @@ -95,31 +95,31 @@ "icon_accent": "#8aadf4", "element_foreground": "#181926", "element_background": "#8aadf4", - "element_hover": "#8aadf4e6", + "element_hover": "#b7bdf8", "element_active": "#7c9cdc", "element_selected": "#6e8bc5", "element_disabled": "#8aadf44d", "secondary_foreground": "#6e8bc5", "secondary_background": "#1e2030", - "secondary_hover": "#8aadf41a", + "secondary_hover": "#8aadf433", "secondary_active": "#181926", "secondary_selected": "#181926", "secondary_disabled": "#8aadf44d", "danger_foreground": "#181926", "danger_background": "#ed8796", - "danger_hover": "#ed87961a", + "danger_hover": "#ee99a0", "danger_active": "#d57a87", "danger_selected": "#be6d78", "danger_disabled": "#ed87964d", "warning_foreground": "#181926", "warning_background": "#eed49f", - "warning_hover": "#eed49f1a", + "warning_hover": "#f5a97f", "warning_active": "#d6bf8f", "warning_selected": "#beaa7f", "warning_disabled": "#eed49f4d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#363a4f", - "ghost_element_hover": "#cad3f51a", + "ghost_element_hover": "#cad3f533", "ghost_element_active": "#494d64", "ghost_element_selected": "#494d64", "ghost_element_disabled": "#cad3f50d", @@ -127,9 +127,9 @@ "tab_inactive_foreground": "#b8c0e0", "tab_active_background": "#24273a", "tab_active_foreground": "#cad3f5", - "tab_hover_foreground": "#8aadf4", + "tab_hover_foreground": "#b7bdf8", "scrollbar_thumb_background": "#cad3f533", - "scrollbar_thumb_hover_background": "#cad3f54d", + "scrollbar_thumb_hover_background": "#cad3f580", "scrollbar_thumb_border": "#00000000", "scrollbar_track_background": "#00000000", "scrollbar_track_border": "#494d64", diff --git a/assets/themes/catppuccin-mocha.json b/assets/themes/catppuccin-mocha.json index 5de69f7..420cbf3 100644 --- a/assets/themes/catppuccin-mocha.json +++ b/assets/themes/catppuccin-mocha.json @@ -28,31 +28,31 @@ "icon_accent": "#89b4fa", "element_foreground": "#11111b", "element_background": "#89b4fa", - "element_hover": "#89b4fae6", + "element_hover": "#b4befe", "element_active": "#7ba2e1", "element_selected": "#6d90c9", "element_disabled": "#89b4fa4d", "secondary_foreground": "#6d90c9", "secondary_background": "#181825", - "secondary_hover": "#89b4fa1a", + "secondary_hover": "#89b4fa33", "secondary_active": "#11111b", "secondary_selected": "#11111b", "secondary_disabled": "#89b4fa4d", "danger_foreground": "#11111b", "danger_background": "#f38ba8", - "danger_hover": "#f38ba81a", + "danger_hover": "#eba0ac", "danger_active": "#db7d98", "danger_selected": "#c46f88", "danger_disabled": "#f38ba84d", "warning_foreground": "#11111b", "warning_background": "#f9e2af", - "warning_hover": "#f9e2af1a", + "warning_hover": "#fab387", "warning_active": "#e0cb9e", "warning_selected": "#c8b48d", "warning_disabled": "#f9e2af4d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#313244", - "ghost_element_hover": "#cdd6f41a", + "ghost_element_hover": "#cdd6f433", "ghost_element_active": "#45475a", "ghost_element_selected": "#45475a", "ghost_element_disabled": "#cdd6f40d", @@ -60,9 +60,9 @@ "tab_inactive_foreground": "#bac2de", "tab_active_background": "#1e1e2e", "tab_active_foreground": "#cdd6f4", - "tab_hover_foreground": "#89b4fa", + "tab_hover_foreground": "#b4befe", "scrollbar_thumb_background": "#cdd6f433", - "scrollbar_thumb_hover_background": "#cdd6f44d", + "scrollbar_thumb_hover_background": "#cdd6f580", "scrollbar_thumb_border": "#00000000", "scrollbar_track_background": "#00000000", "scrollbar_track_border": "#45475a", @@ -95,31 +95,31 @@ "icon_accent": "#89b4fa", "element_foreground": "#11111b", "element_background": "#89b4fa", - "element_hover": "#89b4fae6", + "element_hover": "#b4befe", "element_active": "#7ba2e1", "element_selected": "#6d90c9", "element_disabled": "#89b4fa4d", "secondary_foreground": "#6d90c9", "secondary_background": "#181825", - "secondary_hover": "#89b4fa1a", + "secondary_hover": "#89b4fa33", "secondary_active": "#11111b", "secondary_selected": "#11111b", "secondary_disabled": "#89b4fa4d", "danger_foreground": "#11111b", "danger_background": "#f38ba8", - "danger_hover": "#f38ba81a", + "danger_hover": "#eba0ac", "danger_active": "#db7d98", "danger_selected": "#c46f88", "danger_disabled": "#f38ba84d", "warning_foreground": "#11111b", "warning_background": "#f9e2af", - "warning_hover": "#f9e2af1a", + "warning_hover": "#fab387", "warning_active": "#e0cb9e", "warning_selected": "#c8b48d", "warning_disabled": "#f9e2af4d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#313244", - "ghost_element_hover": "#cdd6f41a", + "ghost_element_hover": "#cdd6f433", "ghost_element_active": "#45475a", "ghost_element_selected": "#45475a", "ghost_element_disabled": "#cdd6f40d", @@ -127,9 +127,9 @@ "tab_inactive_foreground": "#bac2de", "tab_active_background": "#1e1e2e", "tab_active_foreground": "#cdd6f4", - "tab_hover_foreground": "#89b4fa", + "tab_hover_foreground": "#b4befe", "scrollbar_thumb_background": "#cdd6f433", - "scrollbar_thumb_hover_background": "#cdd6f44d", + "scrollbar_thumb_hover_background": "#cdd6f580", "scrollbar_thumb_border": "#00000000", "scrollbar_track_background": "#00000000", "scrollbar_track_border": "#45475a", diff --git a/assets/themes/flexoki.json b/assets/themes/flexoki.json index 9fff1c3..3d5c955 100644 --- a/assets/themes/flexoki.json +++ b/assets/themes/flexoki.json @@ -28,9 +28,9 @@ "icon_accent": "#205EA6", "element_foreground": "#FFFCF0", "element_background": "#205EA6", - "element_hover": "#205EA6e6", - "element_active": "#1A4F8C", - "element_selected": "#163B66", + "element_hover": "#1A4F8C", + "element_active": "#163B66", + "element_selected": "#133051", "element_disabled": "#205EA64d", "secondary_foreground": "#163B66", "secondary_background": "#F2F0E5", @@ -40,15 +40,15 @@ "secondary_disabled": "#205EA64d", "danger_foreground": "#FFFCF0", "danger_background": "#D14D41", - "danger_hover": "#D14D411a", - "danger_active": "#C03E35", - "danger_selected": "#AF3029", + "danger_hover": "#C03E35", + "danger_active": "#AF3029", + "danger_selected": "#942822", "danger_disabled": "#D14D414d", "warning_foreground": "#100F0F", "warning_background": "#D0A215", - "warning_hover": "#D0A2151a", - "warning_active": "#BE9207", - "warning_selected": "#AD8301", + "warning_hover": "#BE9207", + "warning_active": "#AD8301", + "warning_selected": "#8E6B01", "warning_disabled": "#D0A2154d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#E6E4D9", @@ -95,9 +95,9 @@ "icon_accent": "#4385BE", "element_foreground": "#100F0F", "element_background": "#4385BE", - "element_hover": "#4385BEe6", - "element_active": "#3171B2", - "element_selected": "#205EA6", + "element_hover": "#3171B2", + "element_active": "#205EA6", + "element_selected": "#1A4F8C", "element_disabled": "#4385BE4d", "secondary_foreground": "#205EA6", "secondary_background": "#1C1B1A", @@ -107,15 +107,15 @@ "secondary_disabled": "#4385BE4d", "danger_foreground": "#100F0F", "danger_background": "#E8705F", - "danger_hover": "#E8705F1a", - "danger_active": "#D14D41", - "danger_selected": "#C03E35", + "danger_hover": "#D14D41", + "danger_active": "#C03E35", + "danger_selected": "#AF3029", "danger_disabled": "#E8705F4d", "warning_foreground": "#100F0F", "warning_background": "#DFB431", - "warning_hover": "#DFB4311a", - "warning_active": "#D0A215", - "warning_selected": "#BE9207", + "warning_hover": "#D0A215", + "warning_active": "#BE9207", + "warning_selected": "#AD8301", "warning_disabled": "#DFB4314d", "ghost_element_background": "#00000000", "ghost_element_background_alt": "#282726", diff --git a/crates/chat_ui/src/lib.rs b/crates/chat_ui/src/lib.rs index fb16f2e..c1ca330 100644 --- a/crates/chat_ui/src/lib.rs +++ b/crates/chat_ui/src/lib.rs @@ -648,13 +648,20 @@ impl ChatPanel { .w_full() .py_2() .px_3() - .bg(cx.theme().warning_background) .child( h_flex() .gap_3() .text_sm() - .text_color(cx.theme().warning_foreground) - .child(Avatar::new("brand/system.png").size(rems(2.))) + .child( + h_flex() + .flex_shrink_0() + .size_8() + .justify_center() + .rounded_full() + .bg(cx.theme().warning_background) + .text_color(cx.theme().warning_foreground) + .child(Icon::new(IconName::Warning).small()), + ) .child(content), ) .child( diff --git a/crates/coop/src/panels/backup.rs b/crates/coop/src/panels/backup.rs index cf8bb48..e7dbce9 100644 --- a/crates/coop/src/panels/backup.rs +++ b/crates/coop/src/panels/backup.rs @@ -41,7 +41,7 @@ pub struct BackupPanel { impl BackupPanel { pub fn new(window: &mut Window, cx: &mut Context) -> Self { let npub_input = cx.new(|cx| InputState::new(window, cx).disabled(true)); - let nsec_input = cx.new(|cx| InputState::new(window, cx).disabled(true)); + let nsec_input = cx.new(|cx| InputState::new(window, cx).disabled(true).masked(true)); // Run at the end of current cycle cx.defer_in(window, |this, window, cx| { @@ -81,11 +81,14 @@ impl BackupPanel { })); } - fn copy_secret_key(&mut self, cx: &mut Context) { + fn copy_secret(&mut self, cx: &mut Context) { let value = self.nsec_input.read(cx).value(); let item = ClipboardItem::new_string(value.to_string()); - // Copy to clipboard + #[cfg(target_os = "linux")] + cx.write_to_primary(item); + + #[cfg(not(target_os = "linux"))] cx.write_to_clipboard(item); // Set the copied status to true @@ -157,7 +160,12 @@ impl Render for BackupPanel { .text_color(cx.theme().text_muted) .child(SharedString::from("Public Key:")), ) - .child(TextInput::new(&self.npub_input).small().bordered(false)), + .child( + TextInput::new(&self.npub_input) + .small() + .bordered(false) + .disabled(true), + ), ) .child( v_flex() @@ -170,7 +178,12 @@ impl Render for BackupPanel { .text_color(cx.theme().text_muted) .child(SharedString::from("Secret Key:")), ) - .child(TextInput::new(&self.nsec_input).small().bordered(false)), + .child( + TextInput::new(&self.nsec_input) + .small() + .bordered(false) + .disabled(true), + ), ) .child( Button::new("copy") @@ -186,7 +199,7 @@ impl Render for BackupPanel { .small() .font_semibold() .on_click(cx.listener(move |this, _ev, _window, cx| { - this.copy_secret_key(cx); + this.copy_secret(cx); })), ), )