Merge branch 'main' into import-theme

This commit is contained in:
Nate Butler 2023-11-02 20:16:09 -04:00
commit b4e2368943
145 changed files with 9416 additions and 5309 deletions

View file

@ -6,6 +6,7 @@ mod scale;
mod settings;
mod syntax;
use ::settings::Settings;
pub use colors::*;
pub use default_colors::*;
pub use default_theme::*;
@ -14,8 +15,7 @@ pub use scale::*;
pub use settings::*;
pub use syntax::*;
use gpui2::{AppContext, Hsla, SharedString};
use settings2::Settings;
use gpui::{AppContext, Hsla, SharedString};
#[derive(Debug, PartialEq, Clone, Copy)]
pub enum Appearance {