diff --git a/.gitignore b/.gitignore index ff91d5a..339bcb9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .direnv/ build/ static/tw.css +*.ttf +!.gitignore diff --git a/flake.lock b/flake.lock index dbf8ab1..79a81b7 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "ia-fonts-src": { + "flake": false, + "locked": { + "lastModified": 1686932517, + "narHash": "sha256-2T165nFfCzO65/PIHauJA//S+zug5nUwPcg8NUEydfc=", + "owner": "iaolo", + "repo": "iA-Fonts", + "rev": "f32c04c3058a75d7ce28919ce70fe8800817491b", + "type": "github" + }, + "original": { + "owner": "iaolo", + "repo": "iA-Fonts", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1740673841, @@ -32,6 +48,7 @@ }, "root": { "inputs": { + "ia-fonts-src": "ia-fonts-src", "nixpkgs": "nixpkgs", "vite": "vite" } diff --git a/flake.nix b/flake.nix index 60ecf5c..a4a34af 100644 --- a/flake.nix +++ b/flake.nix @@ -1,14 +1,20 @@ { description = "site"; - inputs.nixpkgs.url = "github:nixos/nixpkgs"; - inputs.vite.url = "github:icyphox/go-vite"; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs"; + vite.url = "github:icyphox/go-vite"; + ia-fonts-src = { + url = "github:iaolo/iA-Fonts"; + flake = false; + }; + }; outputs = { self , nixpkgs , vite - , + , ia-fonts-src }: let supportedSystems = [ @@ -35,6 +41,10 @@ pkgs.entr pkgs.tailwindcss ]; + shellHook = '' + cp -f ${ia-fonts-src}/"iA Writer Quattro"/Static/*.ttf static/fonts/ + cp -f ${ia-fonts-src}/"iA Writer Mono"/Static/*.ttf static/fonts/ + ''; }; } ); diff --git a/input.css b/input.css index 1956eee..bb30f55 100644 --- a/input.css +++ b/input.css @@ -100,7 +100,7 @@ @apply text-2xl; @apply font-sans; @apply text-black; - @apply py-4; + @apply font-bold; } ::selection { diff --git a/static/fonts/.gitignore b/static/fonts/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/tailwind.config.js b/tailwind.config.js index fd733cd..55df648 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,23 +1,29 @@ /** @type {import('tailwindcss').Config} */ module.exports = { - content: ["./appview/pages/templates/**/*.html"], - theme: { - container: { - padding: "2rem", - center: true, - screens: { - sm: "540px", - md: "650px", - lg: "900px", - xl: "1100px", - "2xl": "1300x", - }, - }, - extend: { - fontFamily: { - sans: ["iA Writer Quattro S", "Inter", "system-ui", "sans-serif", "ui-sans-serif"], - mono: ["iA Writer Mono S", "ui-monospace", "SFMono-Regular", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", "monospace"], - }, - }, - }, + content: ["./templates/**/*.html"], + theme: { + container: { + padding: "2rem", + center: true, + screens: { + sm: "540px", + md: "640px", + lg: "768px", + xl: "900px", + "2xl": "1024px" + }, + }, + extend: { + fontFamily: { + sans: ["iA Writer Quattro S", "Inter", "system-ui", "sans-serif", "ui-sans-serif"], + mono: ["iA Writer Mono S", "ui-monospace", "SFMono-Regular", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", "monospace"], + }, + maxWidth: { + 'prose': '65ch', + }, + }, + }, + plugins: [ + require('@tailwindcss/typography'), + ], }; diff --git a/templates/index.html b/templates/index.html index 9f925eb..4e1388b 100644 --- a/templates/index.html +++ b/templates/index.html @@ -7,8 +7,8 @@ {{ .Meta.title }} - -
+ +
{{ template "partials/nav.html" }}
diff --git a/templates/partials/footer.html b/templates/partials/footer.html index 89c3154..647e26c 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -1,6 +1,4 @@ -
- -
+ +