From 7f68e8b3115efdbab34d579dc88057ec6c641d38 Mon Sep 17 00:00:00 2001 From: Graham Barber Date: Wed, 14 Aug 2024 20:13:44 -0700 Subject: [PATCH] use Recursive font, Rose Pine theme colors --- config/main.css | 10 ++++++++++ config/tailwind.config.js | 29 +++++++++++++++++++++++++---- html/layouts/default.templ | 6 +++++- html/layouts/default_templ.go | 8 ++++---- main.go | 2 +- 5 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 config/main.css diff --git a/config/main.css b/config/main.css new file mode 100644 index 0000000..a265d3b --- /dev/null +++ b/config/main.css @@ -0,0 +1,10 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +@layer base { + code { + font-variation-settings: "MONO" 1; + min-width: 0; + } +} diff --git a/config/tailwind.config.js b/config/tailwind.config.js index ca5e596..3dd230b 100644 --- a/config/tailwind.config.js +++ b/config/tailwind.config.js @@ -1,11 +1,32 @@ /** @type {import('tailwindcss').Config} */ module.exports = { content: [ - "./**/*.{html,templ}" + "./html/**/*.templ", ], theme: { - extend: {}, + extend: { + fontFamily: { + sans: "Recursive, sans-serif", + mono: "Recursive, monospace", + }, + colors: { + base: "#191724", + surface: "#1f1d2e", + overlay: "#26233a", + muted: "#6e6a86", + subtle: "#908caa", + text: "#e0def4", + love: "#eb6f92", + gold: "#f6c177", + rose: "#ebbcba", + pine: "#31748f", + foam: "#9ccfd8", + iris: "#c4a7e7", + highlightLow: "#21202e", + highlightMed: "#403d52", + highlightHigh: "#524f67", + }, + }, }, plugins: [], -} - +}; diff --git a/html/layouts/default.templ b/html/layouts/default.templ index 39dd5a1..9a06d63 100644 --- a/html/layouts/default.templ +++ b/html/layouts/default.templ @@ -15,6 +15,10 @@ templ Default(body templ.Component, rels []*storage.RelEntry) { Micropub and IndieAuth Server Demo + + + + for _, rel := range rels { @@ -22,7 +26,7 @@ templ Default(body templ.Component, rels []*storage.RelEntry) { - + @body diff --git a/html/layouts/default_templ.go b/html/layouts/default_templ.go index 927a15b..6045332 100644 --- a/html/layouts/default_templ.go +++ b/html/layouts/default_templ.go @@ -36,7 +36,7 @@ func Default(body templ.Component, rels []*storage.RelEntry) templ.Component { templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Micropub and IndieAuth Server Demo") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Micropub and IndieAuth Server Demo") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -48,7 +48,7 @@ func Default(body templ.Component, rels []*storage.RelEntry) templ.Component { var templ_7745c5c3_Var2 string templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(rel.Name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `html/layouts/default.templ`, Line: 20, Col: 28} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `html/layouts/default.templ`, Line: 24, Col: 28} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) if templ_7745c5c3_Err != nil { @@ -61,7 +61,7 @@ func Default(body templ.Component, rels []*storage.RelEntry) templ.Component { var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(rel.HREF) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `html/layouts/default.templ`, Line: 20, Col: 46} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `html/layouts/default.templ`, Line: 24, Col: 46} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { @@ -72,7 +72,7 @@ func Default(body templ.Component, rels []*storage.RelEntry) templ.Component { return templ_7745c5c3_Err } } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/main.go b/main.go index 2593c41..c760b42 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main //go:generate templ generate -//go:generate deno run --allow-all npm:tailwindcss -o static/styles.css -c config/tailwind.config.js --minify +//go:generate deno run --allow-all npm:tailwindcss -i config/main.css -o static/styles.css -c config/tailwind.config.js --minify import ( "os" -- 2.51.2