Merge branch 'collab-panel' of github.com:zed-industries/zed into collab-panel

This commit is contained in:
Mikayla 2023-08-09 10:44:50 -07:00
commit 707e41ce1f
No known key found for this signature in database
8 changed files with 112 additions and 108 deletions

View file

@ -226,9 +226,9 @@ pub struct CollabPanel {
pub channel_modal: ChannelModal,
pub user_query_editor: FieldEditor,
pub user_query_editor_height: f32,
pub leave_call_button: Toggleable<IconButton>,
pub add_contact_button: Toggleable<IconButton>,
pub add_channel_button: Toggleable<IconButton>,
pub leave_call_button: Toggleable<Interactive<IconButton>>,
pub add_contact_button: Toggleable<Interactive<IconButton>>,
pub add_channel_button: Toggleable<Interactive<IconButton>>,
pub header_row: ContainedText,
pub subheader_row: Toggleable<Interactive<ContainedText>>,
pub leave_call: Interactive<ContainedText>,