Commit 14ff84f

Daniel Axtens <dja@axtens.net>
2026-10-27 22:47:58
more css -> one file
1 parent 9c2d83e
assets/code.css
@@ -1,8 +0,0 @@
-@import "lightCode.css" screen and (prefers-color-scheme: light), print;
-@import "darkCode.css" screen and (prefers-color-scheme: dark);
-
-@media print {
-    pre {
-        white-space: pre-wrap !important;
-    }
-}
assets/common.css
@@ -1734,3 +1734,13 @@ h1 code {
 .markdown-body .highlight pre:has(+.zeroclipboard-container) {
   min-height: 52px;
 }
+
+/* code stuff */
+
+@media print {
+    pre {
+        white-space: pre-wrap !important;
+    }
+}
+
+/* generated code styles go below */
pkg/templates/blob.gohtml
@@ -1,7 +1,5 @@
 {{- /*gotype: github.com/antonmedv/gitmal/pkg/templates.BlobParams */ -}}
-{{ define "head" }}
-    <link rel="stylesheet" href="{{ .LayoutParams.RootHref }}assets/code.css">
-{{ end }}
+{{ define "head" }}{{ end }}
 
 {{ define "body" }}
     {{ template "header" . }}
pkg/templates/commit.gohtml
@@ -1,7 +1,5 @@
 {{- /*gotype: github.com/antonmedv/gitmal/pkg/templates.CommitParams*/ -}}
-{{ define "head" }}
-    <link rel="stylesheet" href="{{ .LayoutParams.RootHref }}assets/code.css">
-{{ end }}
+{{ define "head" }}{{ end }}
 
 {{ define "body" }}
     <h1>Commit <code>{{ .Commit.ShortHash }}</code></h1>
pkg/templates/list.gohtml
@@ -1,7 +1,5 @@
 {{- /*gotype: github.com/antonmedv/gitmal/pkg/templates.ListParams*/ -}}
-{{ define "head" }}
-    <link rel="stylesheet" href="{{ .LayoutParams.RootHref }}assets/code.css">
-{{ end }}
+{{ define "head" }}{{ end }}
 
 {{ define "body" }}
     {{ template "header" . }}
pkg/templates/markdown.gohtml
@@ -1,7 +1,5 @@
 {{- /*gotype: github.com/antonmedv/gitmal/pkg/templates.MarkdownParams*/ -}}
-{{ define "head" }}
-    <link rel="stylesheet" href="{{ .LayoutParams.RootHref }}assets/code.css">
-{{ end }}
+{{ define "head" }}{{ end }}
 
 {{ define "body" }}
     {{ template "header" . }}
assets.go
@@ -6,29 +6,27 @@ import (
 	"path/filepath"
 )
 
-//go:embed assets/code.css
-var CodeCSS []byte
-
 //go:embed assets/common.css
 var CommonCSS []byte
 
-var Assets = map[string][]byte{
-	"code.css":   CodeCSS,
-	"common.css": CommonCSS,
-}
-
-func copyAssets(params Params) error {
+func createAssets(params Params) error {
 	outDir := filepath.Join(params.OutputDir, "assets")
 	if err := os.MkdirAll(outDir, 0o755); err != nil {
 		return err
 	}
 
-	for name, data := range Assets {
-		path := filepath.Join(outDir, name)
-		if e := os.WriteFile(path, data, 0o644); e != nil {
-			return e
-		}
+	path := filepath.Join(outDir, "common.css")
+	f, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if _, err := f.Write(CommonCSS); err != nil {
+		return err
 	}
 
+	generateCommitsCSS(f, params)
+
 	return nil
 }
commit.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"html/template"
+	"io"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -24,8 +25,7 @@ import (
 )
 
 // generate the stylesheet for a particular named style
-func generateStyleCSS(outPath string, styleName string) error {
-
+func generateStyleCSS(w io.Writer, styleName string) error {
 	style := styles.Get(styleName)
 	if style == nil {
 		return fmt.Errorf("unknown style: %s", styleName)
@@ -41,31 +41,32 @@ func generateStyleCSS(outPath string, styleName string) error {
 		}),
 	)
 
-	f, err := os.Create(outPath)
-	if err != nil {
+	if err := formatter.WriteCSS(w, style); err != nil {
 		return err
 	}
 
-	if err := formatter.WriteCSS(f, style); err != nil {
+	return nil
+}
+
+func generateCommitsCSS(writer io.Writer, params Params) error {
+
+	if _, err := io.WriteString(writer, "@media screen and (prefers-color-scheme: light), print {\n"); err != nil {
 		return err
 	}
 
-	return nil
-}
+	if err := generateStyleCSS(writer, params.LightStyle); err != nil {
+		return err
+	}
 
-func generateCommitsCSS(params Params) error {
-	outDir := filepath.Join(params.OutputDir, "assets")
-	if err := os.MkdirAll(outDir, 0o755); err != nil {
+	if _, err := io.WriteString(writer, "\n}\n@media screen and (prefers-color-scheme: dark) {\n"); err != nil {
 		return err
 	}
 
-	lightPath := filepath.Join(outDir, "lightCode.css")
-	if err := generateStyleCSS(lightPath, params.LightStyle); err != nil {
+	if err := generateStyleCSS(writer, params.DarkStyle); err != nil {
 		return err
 	}
 
-	darkPath := filepath.Join(outDir, "darkCode.css")
-	if err := generateStyleCSS(darkPath, params.DarkStyle); err != nil {
+	if _, err := io.WriteString(writer, "\n}\n"); err != nil {
 		return err
 	}
 
main.go
@@ -168,6 +168,11 @@ func main() {
 		DefaultRef: git.NewRef(flagDefaultBranch),
 	}
 
+	// first, get our assets together as we refer to them in the templates
+	if err = createAssets(params); err != nil {
+		panic(err)
+	}
+
 	commits := make(map[string]git.Commit)
 	commitsFor := make(map[git.Ref][]git.Commit, len(branches))
 
@@ -247,10 +252,6 @@ func main() {
 
 	// Commits pages generation
 	echo("> generating commit pages...")
-	err = generateCommitsCSS(params)
-	if err != nil {
-		panic(err)
-	}
 	err = generateCommits(commits, params)
 	if err != nil {
 		panic(err)
@@ -272,12 +273,6 @@ func main() {
 		}
 	}
 
-	echo("> copying assets...")
-	err = copyAssets(params)
-	if err != nil {
-		panic(err)
-	}
-
 	if flagMinify || flagGzip {
 		echo("> post-processing...")
 		if err := postProcess(params.OutputDir, flagMinify, flagGzip); err != nil {