Merge pull request #1831 from zed-industries/theme-tweaks

Theme tweaks
This commit is contained in:
Nate Butler 2022-11-02 10:04:55 -04:00 committed by GitHub
commit 6a07f59d34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 401 additions and 117 deletions

View file

@ -54,6 +54,7 @@ impl View for CollabTitlebarItem {
let theme = cx.global::<Settings>().theme.clone();
let mut container = Flex::row();
container.add_children(self.render_toggle_screen_sharing_button(&theme, cx));
if workspace.read(cx).client().status().borrow().is_connected() {
@ -324,6 +325,8 @@ impl CollabTitlebarItem {
cx,
)
.aligned()
.contained()
.with_margin_left(theme.workspace.titlebar.avatar_margin)
.boxed()
}

View file

@ -52,7 +52,7 @@ pub fn render_user_notification<V: View, A: Action + Clone>(
.with_child(
MouseEventHandler::<Dismiss>::new(user.id as usize, cx, |state, _| {
let style = theme.dismiss_button.style_for(state, false);
Svg::new("icons/x_mark_thin_8.svg")
Svg::new("icons/x_mark_8.svg")
.with_color(style.color)
.constrained()
.with_width(style.icon_width)