Merge branch 'main' into chat-again

This commit is contained in:
Max Brunsfeld 2023-09-15 11:06:39 -07:00
commit 6c3fd2a687
547 changed files with 1040 additions and 4715 deletions

View file

@ -1243,7 +1243,7 @@ impl CollabPanel {
.collab_panel
.add_contact_button
.style_for(is_selected, state),
"icons/plus_16.svg",
"icons/plus.svg",
)
})
.with_cursor_style(CursorStyle::PointingHand)
@ -1687,7 +1687,7 @@ impl CollabPanel {
cx.font_cache(),
))
.with_child(
Svg::new("icons/radix/file.svg")
Svg::new("icons/file.svg")
.with_color(theme.channel_hash.color)
.constrained()
.with_width(theme.channel_hash.width)