Merge branch 'main' into contact-panel-keyboard-nav

crates/theme/src/theme.rs

@@ -29,6 +29,7 @@ pub struct Theme {
     pub search: Search,
     pub project_diagnostics: ProjectDiagnostics,
     pub breadcrumbs: ContainedText,
+    pub contact_notification: ContactNotification,
 }
 
 #[derive(Deserialize, Default)]
@@ -45,6 +46,8 @@ pub struct Workspace {
     pub toolbar: Toolbar,
     pub disconnected_overlay: ContainedText,
     pub modal: ContainerStyle,
+    pub notification: ContainerStyle,
+    pub notifications: Notifications,
 }
 
 #[derive(Clone, Deserialize, Default)]
@@ -109,6 +112,13 @@ pub struct Toolbar {
     pub item_spacing: f32,
 }
 
+#[derive(Clone, Deserialize, Default)]
+pub struct Notifications {
+    #[serde(flatten)]
+    pub container: ContainerStyle,
+    pub width: f32,
+}
+
 #[derive(Clone, Deserialize, Default)]
 pub struct Search {
     #[serde(flatten)]
@@ -152,6 +162,7 @@ pub struct StatusBarSidebarButtons {
     pub group_left: ContainerStyle,
     pub group_right: ContainerStyle,
     pub item: Interactive<SidebarItem>,
+    pub badge: ContainerStyle,
 }
 
 #[derive(Deserialize, Default)]
@@ -350,6 +361,16 @@ pub struct ProjectDiagnostics {
     pub tab_summary_spacing: f32,
 }
 
+#[derive(Deserialize, Default)]
+pub struct ContactNotification {
+    pub header_avatar: ImageStyle,
+    pub header_message: ContainedText,
+    pub header_height: f32,
+    pub body_message: ContainedText,
+    pub button: Interactive<ContainedText>,
+    pub dismiss_button: Interactive<IconButton>,
+}
+
 #[derive(Clone, Deserialize, Default)]
 pub struct Editor {
     pub text_color: Color,