Merge remote-tracking branch 'origin/main' into cache
# Conflicts: # crates/copilot/src/sign_in.rs # crates/gpui/src/window.rs # crates/workspace/src/pane_group.rs
This commit is contained in:
commit
1c260e6dfd
216 changed files with 4218 additions and 2389 deletions
|
@ -165,7 +165,8 @@ impl Default for TextStyle {
|
|||
fn default() -> Self {
|
||||
TextStyle {
|
||||
color: black(),
|
||||
font_family: "Helvetica".into(), // todo!("Get a font we know exists on the system")
|
||||
// Helvetica is a web safe font, so it should be available
|
||||
font_family: "Helvetica".into(),
|
||||
font_features: FontFeatures::default(),
|
||||
font_size: rems(1.).into(),
|
||||
line_height: phi(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue