feat: update css variables

ifiokjr · May 29, 2023 · 108eccd · 108eccd
1 parent 11604ab
commit 108eccd
Show file tree

Hide file tree

Showing 15 changed files with 779 additions and 1,883 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/skribble_core/src/config/css_variables.rs b/crates/skribble_core/src/config/css_variables.rs
@@ -193,13 +193,15 @@ impl CssVariable {
  }
  }
 
- writeln!(writer, "@property {variable_name} {{")?;
- let mut indented_writer = indent_writer();
- writeln!(indented_writer, "syntax: \"{syntax}\";")?;
- writeln!(indented_writer, "inherits: true;")?;
- writeln!(indented_writer, "initial-value: {value};")?;
- write!(writer, "{}", indented_writer.get_ref())?;
- writeln!(writer, "}}")?;
+ if !value.is_empty() {
+ writeln!(writer, "@property {variable_name} {{")?;
+ let mut indented_writer = indent_writer();
+ writeln!(indented_writer, "syntax: \"{syntax}\";")?;
+ writeln!(indented_writer, "inherits: true;")?;
+ writeln!(indented_writer, "initial-value: {value};")?;
+ write!(writer, "{}", indented_writer.get_ref())?;
+ writeln!(writer, "}}")?;
+ }
 
  Ok(())
  }

diff --git a/crates/skribble_core/src/config/formatter.rs b/crates/skribble_core/src/config/formatter.rs
@@ -72,8 +72,7 @@ impl Formatter {
  files.replace(generated);
  }
 
- println!("Formatted files: {tmpdir:?}");
- // fs::remove_dir_all(&tmpdir)?;
+ fs::remove_dir_all(&tmpdir)?;
 
  Ok(())
  }

diff --git a/crates/skribble_core/src/css/__tests.rs b/crates/skribble_core/src/css/__tests.rs
@@ -243,7 +243,7 @@ fn create_config() -> StyleConfig {
  CssVariable::builder()
  .name("custom")
  .variable("--c")
- .value("")
+ .value("inherit")
  .description("A custom variable")
  .build(),
  CssVariable::builder()

diff --git a/crates/skribble_core/src/css/snapshots/[email protected] b/crates/skribble_core/src/css/snapshots/[email protected]
@@ -8,11 +8,11 @@ expression: css
 @property --sk-c {
  syntax: "*";
  inherits: true;
- initial-value: ;
+ initial-value: inherit;
 }
 @layer default {
  :root {
- --sk-c: ;
+ --sk-c: inherit;
  }
  .needs-custom\:\$px {
  --sk-c: ;

diff --git a/crates/skribble_preset/src/__tests.rs b/crates/skribble_preset/src/__tests.rs
@@ -45,12 +45,6 @@ fn css_from_class_names(#[case] id: &str, #[case] names: &[&str]) -> AnyEmptyRes
 
  classes.sort_by_class();
 
- println!("CLASSES: {classes:#?}, LENGTH: {}", classes.len());
-
- for class in classes.iter() {
- println!("{:#?}", class);
- }
-
  set_snapshot_suffix!("{id}");
  insta::assert_display_snapshot!(classes.to_skribble_css(runner_config)?);
 

diff --git a/crates/skribble_preset/src/data/atoms.rs b/crates/skribble_preset/src/data/atoms.rs
@@ -1236,7 +1236,7 @@ lazy_static! {
  .styles(indexmap! { &gradient_from_position => none })
  .build(),
  Atom::builder()
- .name("via")
+ .name("via-position")
  .values(ColorField::default())
  .children(vec!["gradient-reference"])
  .styles({
@@ -1257,7 +1257,7 @@ lazy_static! {
  .styles(indexmap! { &gradient_via_position => none })
  .build(),
  Atom::builder()
- .name("to")
+ .name("to-color")
  .values(ColorField::default())
  .children(vec!["gradient-reference"])
  .styles({