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

Aligned title bar items to the center and fixed left spacing on the sign in button

Browse source 
co-authored-by: max <max@zed.dev>
This commit is contained in:
Mikayla Maki 2023-03-23 13:08:31 -07:00
parent f9d3963dbb
commit bb5c2833a3
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -89,7 +89,7 @@ impl View for CollabTitlebarItem {
let theme = cx.global::<Settings>().theme.clone(); let theme = cx.global::<Settings>().theme.clone();
let mut left_container = Flex::row(); let mut left_container = Flex::row();
let mut right_container = Flex::row(); let mut right_container = Flex::row().align_children_center();
left_container.add_child( left_container.add_child(
Label::new(project_title, theme.workspace.titlebar.title.clone()) Label::new(project_title, theme.workspace.titlebar.title.clone())
@ -117,6 +117,7 @@ impl View for CollabTitlebarItem {
let status = workspace.read(cx).client().status(); let status = workspace.read(cx).client().status();
let status = &*status.borrow(); let status = &*status.borrow();
if matches!(status, client::Status::Connected { .. }) { if matches!(status, client::Status::Connected { .. }) {
right_container.add_child(self.render_toggle_contacts_button(&theme, cx)); right_container.add_child(self.render_toggle_contacts_button(&theme, cx));
right_container.add_child(self.render_user_menu_button(&theme, cx)); right_container.add_child(self.render_user_menu_button(&theme, cx));

3
styles/src/styleTree/workspace.ts
View file

@ -174,6 +174,9 @@ export default function workspace(colorScheme: ColorScheme) {
// Sign in buttom // Sign in buttom
// FlatButton, Variant // FlatButton, Variant
signInPrompt: { signInPrompt: {
margin: {
left: itemSpacing
},
...titlebarButton, ...titlebarButton,
}, },