minify css

ansi2/src/css.rs

@@ -94,28 +94,28 @@ pub(crate) fn to_style(
     let light_color_css: String = light_colors
         .iter()
         .fold(String::new(), |mut acc, (name, c)| {
-            acc.push_str(&format!(".{name}{{ {color_field}: {};}} ", c));
+            acc.push_str(&format!(".{name}{{{color_field}:{};}}", c));
             acc
         });
 
     let bg_light_color_css: String =
         light_colors
             .iter()
             .fold(String::new(), |mut acc, (name, c)| {
-                acc.push_str(&format!(".bg-{name}{{ {bg_field}: {};}} ", c));
+                acc.push_str(&format!(".bg-{name}{{{bg_field}:{};}} ", c));
                 acc
             });
     let dark_color_css: String = dark_colors
         .iter()
         .fold(String::new(), |mut acc, (name, c)| {
-            acc.push_str(&format!(".{name}{{ {color_field}: {};}} ", c));
+            acc.push_str(&format!(".{name}{{{color_field}:{};}}", c));
             acc
         });
 
     let bg_dark_color_css: String = dark_colors
         .iter()
         .fold(String::new(), |mut acc, (name, c)| {
-            acc.push_str(&format!(".bg-{name}{{ {bg_field}: {};}} ", c));
+            acc.push_str(&format!(".bg-{name}{{{bg_field}:{};}}", c));
             acc
         });
 
@@ -144,14 +144,7 @@ pub(crate) fn to_style(
         };
 
         let style = format!(
-            r#"
-{root_style}
-{default_text_style}
-{common_style}
-{color_css}
-{bg_color_css}
-{color256_str}
-      "#
+            r#"{root_style}{default_text_style}{common_style}{color_css}{bg_color_css}{color256_str}"#
         )
         .trim()
         .to_string();
@@ -170,39 +163,15 @@ pub(crate) fn to_style(
     };
 
     let root_css = format!(
-        r#"
-:root {{color-scheme: light dark; background-color: {light_bg_color}}}
-{light_color_css}
-{bg_light_color_css}
-{default_light_text_style}
-"#
+        r#":root {{color-scheme: light dark; background-color: {light_bg_color}}}{light_color_css}{bg_light_color_css}{default_light_text_style}"#
     );
 
     let dark_css = format!(
-        r#"
-@media (prefers-color-scheme: dark) {{
-:root {{background-color: {dark_bg_color}}}
-{dark_color_css}
-{bg_dark_color_css}
-{default_dark_text_style}
-}}
-"#
-    )
+        r#"@media (prefers-color-scheme: dark) {{:root {{background-color: {dark_bg_color}}}{dark_color_css}{bg_dark_color_css}{default_dark_text_style}}}"#)
     .trim()
     .to_string();
 
-    format!(
-        r#"
-{root_css}
-
-{dark_css}
-
-{common_style}
-
-{color256_str}
-
-"#,
-    )
-    .trim()
-    .to_string()
+    format!(r#"{root_css}{dark_css}{common_style}{color256_str}"#,)
+        .trim()
+        .to_string()
 }

ansi2/src/html.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use crate::{
-    css::{to_style, CssType, Mode},
+    css::{get_hex, to_style, CssType, Mode},
     theme::ColorTable,
     Canvas,
 };
@@ -25,14 +25,8 @@ pub fn to_html<S: AsRef<str>>(
     if let Some(url) = font {
         if url.starts_with("http") || url.starts_with("data:font;base64") {
             font_family = "ansi2-custom-font".into();
-            font_style = format!(
-                r#"
-  @font-face {{
-    font-family: ansi2-custom-font;
-    src: url({url});
-  }}
-  "#
-            )
+            font_style =
+                format!(r#"@font-face {{font-family: ansi2-custom-font;src: url({url});}}"#)
         } else {
             font_family = url;
         }
@@ -66,7 +60,10 @@ pub fn to_html<S: AsRef<str>>(
                 text_class.push(name);
 
                 if let crate::lex::AnsiColor::Rgb(r, g, b) = c.color {
-                    color256.insert(format!(".rgb_{r}_{g}_{b}{{ color: rgb({r},{g},{b}) ;}}\n"));
+                    color256.insert(format!(
+                        ".rgb_{r}_{g}_{b}{{color:{};}}\n",
+                        get_hex((r, g, b))
+                    ));
                 }
             }
 
@@ -76,7 +73,8 @@ pub fn to_html<S: AsRef<str>>(
 
                 if let crate::lex::AnsiColor::Rgb(r, g, b) = c.color {
                     color256.insert(format!(
-                        ".bg-rgb_{r}_{g}_{b}{{ background: rgb({r},{g},{b}) ;}}\n"
+                        ".bg-rgb_{r}_{g}_{b}{{background:{};}}\n",
+                        get_hex((r, g, b))
                     ));
                 }
             }
@@ -112,12 +110,7 @@ pub fn to_html<S: AsRef<str>>(
 {color256_str}
 .ansi-main{{display:flex;flex-direction:column;}}
 .row{{display: flex;}}
-.char{{
-  margin: 0;
-  padding: 0;
-  font-family: {font_family};
-  white-space: pre;
-}}</style></head><body>{s}</body></html>
+.char{{margin: 0;padding: 0;font-family: {font_family};white-space: pre;}}</style></head><body>{s}</body></html>
 "#
     )
 }

ansi2/src/svg.rs

@@ -30,14 +30,8 @@ pub fn to_svg<S: AsRef<str>>(
     if let Some(url) = font {
         if url.starts_with("http") || url.starts_with("data:font;base64") {
             font_family = "ansi2-custom-font".into();
-            font_style = format!(
-                r#"
-@font-face {{
-font-family: ansi2-custom-font;
-src: url({url});
-}}
-"#
-            )
+            font_style =
+                format!(r#"@font-face {{font-family: ansi2-custom-font;src: url({url});}}"#)
         } else {
             font_family = url;
         }

lefthook.yml

@@ -1,5 +1,5 @@
 pre-commit:
   commands:
     check:
-      glob: "*.{js,ts,json,tsx}"
+      glob: "*.{js,ts,json,tsx,rs,toml}"
       run: npm run pre-check && git add {staged_files}