Merge every CSS file into once

muhokama · Aug 13, 2024 · e928904 · e928904
1 parent 7c94279
commit e928904
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/lib/action/css.ml b/lib/action/css.ml
@@ -1,2 +1,9 @@
 let run (module R : Sigs.RESOLVER) =
-  Batch_copy.run ~extension:[ "css" ] ~source:R.Source.css ~target:R.Target.css
+  Yocaml.Action.Static.write_file R.Target.css
+    (Yocaml.Pipeline.pipe_files ~separator:"\n"
+       Yocaml.Path.
+         [
+           R.Source.css / "fonts.css";
+           R.Source.css / "reset.css";
+           R.Source.css / "style.css";
+         ])
diff --git a/lib/resolver.ml b/lib/resolver.ml
@@ -29,7 +29,7 @@ module Make (R : Sigs.RESOLVABLE) = struct
     let atom = Path.(R.target / "atom.xml")
     let ring_opml = Path.(opml / "ring.opml")
     let members = Path.(R.target / "u")
-    let css = Path.(R.target / "css")
+    let css = Path.(R.target / "css" / "style.css")
     let fonts = Path.(R.target / "fonts")
     let index = Path.(R.target / "index.html")
     let images = Path.(R.target / "images")

diff --git a/static/templates/layout.html b/static/templates/layout.html
@@ -9,8 +9,6 @@
     <title>
       ring.muhokama.fun{%- if has_page_title %} - {{ page_title }}{%- endif -%}
     </title>
-    <link rel="stylesheet" href="/css/fonts.css" />
-    <link rel="stylesheet" href="/css/reset.css" />
     <link rel="stylesheet" href="/css/style.css" />
   </head>
   <body>