Merge branch 'main' into notifications

2023-10-18 17:20:04 -07:00
parent d05404a4df 199740902a
commit b07f9fe3b5
61 changed files with 3184 additions and 1147 deletions
@@ -287,6 +287,8 @@ pub struct TabbedModal {
    pub header: ContainerStyle,
    pub body: ContainerStyle,
    pub title: ContainedText,
+    pub visibility_toggle: Interactive<ContainedText>,
+    pub channel_link: Interactive<ContainedText>,
    pub picker: Picker,
    pub max_height: f32,
    pub max_width: f32,
@@ -1216,6 +1218,15 @@ pub struct InlineAssistantStyle {
    pub disabled_editor: FieldEditor,
    pub pending_edit_background: Color,
    pub include_conversation: ToggleIconButtonStyle,
+    pub retrieve_context: ToggleIconButtonStyle,
+    pub context_status: ContextStatusStyle,
+}
+
+#[derive(Clone, Deserialize, Default, JsonSchema)]
+pub struct ContextStatusStyle {
+    pub error_icon: Icon,
+    pub in_progress_icon: Icon,
+    pub complete_icon: Icon,
 }

 #[derive(Clone, Deserialize, Default, JsonSchema)]