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

Merge remote-tracking branch 'origin/main' into editor-movement

Browse source
This commit is contained in:
Antonio Scandurra 2023-11-07 18:50:43 +01:00
commit aa17adaac9
14 changed files with 68 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/theme2/src/registry.rs
View file

@ -52,7 +52,10 @@ impl ThemeRegistry {
status: StatusColors::default(),
git: GitStatusColors::default(),
player: PlayerColors::default(),
syntax: Arc::new(SyntaxTheme::default_dark()),
syntax: match user_theme.appearance {
Appearance::Light => Arc::new(SyntaxTheme::default_light()),
Appearance::Dark => Arc::new(SyntaxTheme::default_dark()),
},
},
}
}));
@ -81,7 +84,7 @@ impl Default for ThemeRegistry {
};
this.insert_theme_families([zed_pro_family()]);
this.insert_user_theme_familes(crate::all_imported_themes());
this.insert_user_theme_familes(crate::all_user_themes());
this
}