reya/coop
1
0
Fork 1
Code Issues Pull Requests Releases 5 Activity

wip

Browse Source
This commit is contained in:
reya
2026-10-08 08:51:11 +07:00
parent 2efb6ac5ca
commit f4b435b160
48 changed files with 211 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/workspace/src/dialogs/import.rs
+3 -3
View File
@@ -255,7 +255,7 @@ impl Render for ImportIdentity {
this.child(
div()
.text_xs()
.text_color(cx.theme().text_warning)
.text_color(cx.theme().warning)
.child(div().child(BUNKER_WARN)),
)
})
@@ -263,7 +263,7 @@ impl Render for ImportIdentity {
this.child(
div()
.text_xs()
.text_color(cx.theme().text_warning)
.text_color(cx.theme().warning)
.child(div().child(KEY_WARN)),
)
}),
@@ -297,7 +297,7 @@ impl Render for ImportIdentity {
div()
.text_xs()
.text_center()
.text_color(cx.theme().text_danger)
.text_color(cx.theme().danger)
.child(error.clone()),
)
})
crates/workspace/src/dialogs/new_chat.rs
+4 -4
View File
@@ -380,9 +380,9 @@ impl NewChat {
.gap_1()
.p_0p5()
.rounded_full()
.bg(cx.theme().ghost_element_background_alt)
.bg(cx.theme().raised)
.text_size(px(10.))
.hover(|this| this.bg(cx.theme().ghost_element_hover))
.hover(|this| this.bg(cx.theme().hover))
.child(
Avatar::from_source(profile.avatar())
.seed(profile.avatar_seed())
@@ -430,14 +430,14 @@ impl Render for NewChat {
this.child(
div()
.text_xs()
.text_color(cx.theme().text_danger)
.text_color(cx.theme().danger)
.child(error),
)
} else {
this.child(
div()
.text_xs()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.child(notice),
)
}
crates/workspace/src/dialogs/profile.rs
+2 -2
View File
@@ -366,7 +366,7 @@ impl Render for ProfileDialog {
.w_full()
.items_center()
.justify_center()
.bg(cx.theme().surface_background)
.bg(cx.theme().shell)
.child(Avatar::new(avatar).seed(profile.avatar_seed()).large())
.when(self.editing, |this| {
this.child(
@@ -392,7 +392,7 @@ impl Render for ProfileDialog {
.justify_center()
.gap_3()
.rounded(cx.theme().radius)
.bg(cx.theme().surface_background)
.bg(cx.theme().shell)
.text_sm()
.child(shorten_pkey)
.child(
crates/workspace/src/dialogs/relays.rs
+3 -3
View File
@@ -154,7 +154,7 @@ impl RelayManager {
div()
.italic()
.text_xs()
.text_color(cx.theme().text_danger)
.text_color(cx.theme().danger)
.child(error.clone()),
)
})
@@ -225,7 +225,7 @@ impl RelayManager {
div()
.italic()
.text_xs()
.text_color(cx.theme().text_danger)
.text_color(cx.theme().danger)
.child(error.clone()),
)
})
@@ -647,7 +647,7 @@ fn relay_row(
.px_2()
.justify_between()
.rounded(cx.theme().radius)
.bg(cx.theme().surface_background)
.bg(cx.theme().shell)
.child(
h_flex()
.gap_1()
crates/workspace/src/dialogs/restore.rs
+1 -1
View File
@@ -122,7 +122,7 @@ impl Render for RestoreEncryption {
div()
.text_xs()
.text_center()
.text_color(cx.theme().text_danger)
.text_color(cx.theme().danger)
.child(error.clone()),
)
})
crates/workspace/src/dialogs/screening.rs
+4 -4
View File
@@ -294,7 +294,7 @@ impl Screening {
.gap_1p5()
.rounded(cx.theme().radius)
.text_sm()
.hover(|this| this.bg(cx.theme().elevated_surface_background))
.hover(|this| this.bg(cx.theme().raised))
.child(Avatar::new(profile.avatar()).small())
.child(profile.name()),
);
@@ -353,7 +353,7 @@ impl Render for Screening {
.h_7()
.justify_center()
.rounded_full()
.bg(cx.theme().elevated_surface_background)
.bg(cx.theme().raised)
.text_sm()
.truncate()
.text_ellipsis()
@@ -533,9 +533,9 @@ fn status_badge(status: Option<bool>, cx: &App) -> Div {
if let Some(status) = status {
this.child(Icon::new(IconName::CheckCircle).small().text_color({
if status {
cx.theme().icon_accent
cx.theme().accent.primary
} else {
cx.theme().icon_muted
cx.theme().text_faint
}
}))
} else {
crates/workspace/src/dialogs/settings.rs
+1 -1
View File
@@ -203,7 +203,7 @@ impl Render for Preferences {
div()
.text_size(px(10.))
.italic()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.child(SharedString::from("Only support blossom service")),
),
),
crates/workspace/src/lib.rs
+3 -3
View File
@@ -439,7 +439,7 @@ impl Workspace {
.child(
div()
.italic()
.text_color(cx.theme().text_danger)
.text_color(cx.theme().danger)
.child(SharedString::from(ENC_WARN)),
),
)
@@ -487,8 +487,8 @@ impl Workspace {
.w_full()
.justify_between()
.rounded(cx.theme().radius)
.bg(cx.theme().ghost_element_background)
.hover(|this| this.bg(cx.theme().ghost_element_hover))
.bg(gpui::transparent_black())
.hover(|this| this.bg(cx.theme().hover))
.child(
h_flex()
.gap_1p5()
crates/workspace/src/panels/browse.rs
+7 -7
View File
@@ -295,7 +295,7 @@ impl BrowsePanel {
.max_w_64()
.px_1()
.rounded(cx.theme().radius)
.bg(cx.theme().surface_background)
.bg(cx.theme().shell)
.child(
Input::new(&self.input)
.appearance(false)
@@ -378,11 +378,11 @@ impl BrowsePanel {
.rounded(cx.theme().radius)
.cursor_pointer()
.border_1()
.border_color(cx.theme().border_transparent)
.bg(cx.theme().surface_background)
.border_color(gpui::transparent_black())
.bg(cx.theme().shell)
.hover(|this| {
this.bg(cx.theme().elevated_surface_background)
.border_color(cx.theme().border_focused)
this.bg(cx.theme().raised)
.border_color(cx.theme().accent.primary)
})
.child(
v_flex()
@@ -414,7 +414,7 @@ impl BrowsePanel {
div()
.truncate()
.text_xs()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.child(relay),
),
),
@@ -467,7 +467,7 @@ impl Panel for BrowsePanel {
.child(
Icon::new(IconName::Compass)
.small()
.text_color(cx.theme().icon_muted),
.text_color(cx.theme().text_faint),
)
.child(TITLE)
.into_any_element()
crates/workspace/src/panels/contact_list.rs
+2 -2
View File
@@ -234,7 +234,7 @@ impl ContactListPanel {
.px_2()
.justify_between()
.rounded(cx.theme().radius)
.hover(|this| this.bg(cx.theme().ghost_element_hover))
.hover(|this| this.bg(cx.theme().hover))
.child(
h_flex()
.gap_2()
@@ -343,7 +343,7 @@ impl Render for ContactListPanel {
div()
.italic()
.text_xs()
.text_color(cx.theme().text_danger)
.text_color(cx.theme().danger)
.child(error.clone()),
)
}),
crates/workspace/src/panels/greeter.rs
+1 -1
View File
@@ -91,7 +91,7 @@ impl Render for GreeterPanel {
svg()
.path("brand/coop.svg")
.size_12()
.text_color(cx.theme().icon_muted),
.text_color(cx.theme().text_faint),
)
.child(
v_flex()
crates/workspace/src/panels/inbox.rs
+1 -1
View File
@@ -35,7 +35,7 @@ impl Panel for InboxPanel {
.child(
Icon::new(IconName::Inbox)
.small()
.text_color(cx.theme().icon_muted),
.text_color(cx.theme().text_faint),
)
.child(self.name.clone())
.into_any_element()
crates/workspace/src/panels/requests.rs
+1 -1
View File
@@ -35,7 +35,7 @@ impl Panel for RequestsPanel {
.child(
Icon::new(IconName::Invite)
.small()
.text_color(cx.theme().icon_muted),
.text_color(cx.theme().text_faint),
)
.child(self.name.clone())
.into_any_element()
crates/workspace/src/panels/search.rs
+2 -2
View File
@@ -437,7 +437,7 @@ impl Panel for SearchPanel {
.child(
Icon::new(IconName::Search)
.small()
.text_color(cx.theme().icon_muted),
.text_color(cx.theme().text_faint),
)
.child(self.name.clone())
.into_any_element()
@@ -500,7 +500,7 @@ impl Render for SearchPanel {
.gap_1()
.flex_1()
.border_b_1()
.border_color(cx.theme().border_variant)
.border_color(cx.theme().border)
.child(
h_flex()
.gap_0p5()
crates/workspace/src/sidebar/group_view.rs
+3 -3
View File
@@ -230,10 +230,10 @@ impl Sidebar {
Nav::new(label)
.label(label)
.suffix(Icon::new(icon).small().text_color(cx.theme().icon_muted))
.suffix(Icon::new(icon).small().text_color(cx.theme().text_faint))
.text_xs()
.font_semibold()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.on_click(cx.listener(move |this, _event, _window, cx| {
match section {
GroupSection::Admins => this.admins_open = !this.admins_open,
@@ -277,7 +277,7 @@ impl Sidebar {
div()
.truncate()
.text_xs()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.child(SharedString::from(roles.join(", "))),
)
})
crates/workspace/src/sidebar/list.rs
+4 -4
View File
@@ -89,7 +89,7 @@ impl Sidebar {
.text_color(cx.theme().text_muted)
.text_center()
.rounded(cx.theme().radius)
.bg(cx.theme().elevated_surface_background)
.bg(cx.theme().raised)
.child(SharedString::from(
request_count.to_string(),
)),
@@ -102,7 +102,7 @@ impl Sidebar {
)
})
.when(requests_open, |this| {
this.bg(cx.theme().ghost_element_active)
this.bg(cx.theme().active)
})
.on_click(cx.listener(|this, _event, _window, cx| {
this.toggle_requests(cx);
@@ -111,7 +111,7 @@ impl Sidebar {
.child(
NavItem::new("contacts", "Contacts", Icon::new(IconName::Book).small())
.when(contacts_open, |this| {
this.bg(cx.theme().ghost_element_active)
this.bg(cx.theme().active)
})
.on_click(cx.listener(|this, _event, window, cx| {
this.toggle_contacts(window, cx);
@@ -124,7 +124,7 @@ impl Sidebar {
.px_4()
.text_xs()
.font_semibold()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.child(list_title),
)
})
crates/workspace/src/sidebar/mod.rs
+2 -2
View File
@@ -277,7 +277,7 @@ impl Render for Sidebar {
.size_full()
.relative()
.gap_2()
.bg(cx.theme().surface_background)
.bg(cx.theme().shell)
.when_some(current_user.as_ref(), |this, current_user| {
this.child(title_bar_drag_handlers(
self.render_user(current_user, cx),
@@ -336,7 +336,7 @@ impl Render for Sidebar {
.text_xs()
.font_semibold()
.text_color(cx.theme().text_muted)
.child(Indicator::new().small().color(cx.theme().icon_accent))
.child(Indicator::new().small().color(cx.theme().accent.primary))
.child("Getting messages..."),
),
)
crates/workspace/src/sidebar/rows.rs
+7 -7
View File
@@ -89,10 +89,10 @@ impl Sidebar {
Nav::new(label)
.label(label)
.suffix(Icon::new(icon).small().text_color(cx.theme().icon_muted))
.suffix(Icon::new(icon).small().text_color(cx.theme().text_faint))
.text_xs()
.font_semibold()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.on_click(cx.listener(move |this, _event, _window, cx| {
match section {
ListSection::Pins => this.pins_open = !this.pins_open,
@@ -114,7 +114,7 @@ impl Sidebar {
.label(label)
.text_xs()
.font_semibold()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.into_any_element()
}
SidebarRow::Empty(text) => v_flex()
@@ -132,7 +132,7 @@ impl Sidebar {
.border_color(cx.theme().border)
.rounded(cx.theme().radius)
.text_xs()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.child(*text),
)
.into_any_element(),
@@ -162,7 +162,7 @@ impl Sidebar {
div()
.font_normal()
.text_xs()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.child(created_at),
)
.on_click(move |_event, window, cx| {
@@ -279,7 +279,7 @@ impl Sidebar {
div()
.font_normal()
.text_xs()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.child(suffix),
)
})
@@ -353,7 +353,7 @@ impl Sidebar {
div()
.font_normal()
.text_xs()
.text_color(cx.theme().text_placeholder)
.text_color(cx.theme().text_faint)
.child(detail),
)
.on_click(move |_event, window, cx| {
crates/workspace/src/sidebar/search.rs
+1 -1
View File
@@ -202,7 +202,7 @@ impl Sidebar {
.gap_1()
.w_full()
.rounded(cx.theme().radius)
.bg(cx.theme().elevated_surface_background)
.bg(cx.theme().raised)
.child(
Input::new(&self.find_input)
.appearance(false)