Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into assistant-2

Browse source 
# Conflicts:
#	crates/ui2/src/components/icon.rs
This commit is contained in:
Antonio Scandurra 2023-12-06 18:17:59 +01:00
commit 14def2a1a3
41 changed files with 1667 additions and 1270 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ui2/src/components/icon.rs
View file

@ -93,6 +93,7 @@ pub enum Icon {
Option,
Return,
Update,
ZedXCopilot,
}
impl Icon {
@ -121,6 +122,7 @@ impl Icon {
Icon::Close => "icons/x.svg",
Icon::Collab => "icons/user_group_16.svg",
Icon::Copilot => "icons/copilot.svg",
Icon::CopilotInit => "icons/copilot_init.svg",
Icon::CopilotError => "icons/copilot_error.svg",
Icon::CopilotDisabled => "icons/copilot_disabled.svg",
@ -168,6 +170,7 @@ impl Icon {
Icon::Option => "icons/option.svg",
Icon::Return => "icons/return.svg",
Icon::Update => "icons/update.svg",
Icon::ZedXCopilot => "icons/zed_x_copilot.svg",
}
}
}