forked from tangled.org/core
Monorepo for Tangled

appview: switch to Inter and IBM Plex Mono

anirudh.fi 0a90fef2 50df3664

verified
+22 -11
flake.lock
··· 32 32 "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" 33 33 } 34 34 }, 35 - "ia-fonts-src": { 35 + "ibm-plex-mono-src": { 36 36 "flake": false, 37 37 "locked": { 38 - "lastModified": 1686932517, 39 - "narHash": "sha256-2T165nFfCzO65/PIHauJA//S+zug5nUwPcg8NUEydfc=", 40 - "owner": "iaolo", 41 - "repo": "iA-Fonts", 42 - "rev": "f32c04c3058a75d7ce28919ce70fe8800817491b", 43 - "type": "github" 38 + "lastModified": 1731402384, 39 + "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", 40 + "type": "tarball", 41 + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" 44 42 }, 45 43 "original": { 46 - "owner": "iaolo", 47 - "repo": "iA-Fonts", 48 - "type": "github" 44 + "type": "tarball", 45 + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" 49 46 } 50 47 }, 51 48 "indigo": { ··· 64 61 "type": "github" 65 62 } 66 63 }, 64 + "inter-fonts-src": { 65 + "flake": false, 66 + "locked": { 67 + "lastModified": 1731680160, 68 + "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=", 69 + "type": "tarball", 70 + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" 71 + }, 72 + "original": { 73 + "type": "tarball", 74 + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" 75 + } 76 + }, 67 77 "lucide-src": { 68 78 "flake": false, 69 79 "locked": { ··· 97 107 "inputs": { 98 108 "gitignore": "gitignore", 99 109 "htmx-src": "htmx-src", 100 - "ia-fonts-src": "ia-fonts-src", 110 + "ibm-plex-mono-src": "ibm-plex-mono-src", 101 111 "indigo": "indigo", 112 + "inter-fonts-src": "inter-fonts-src", 102 113 "lucide-src": "lucide-src", 103 114 "nixpkgs": "nixpkgs" 104 115 }
+14 -7
flake.nix
··· 15 15 url = "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip"; 16 16 flake = false; 17 17 }; 18 - ia-fonts-src = { 19 - url = "github:iaolo/iA-Fonts"; 18 + inter-fonts-src = { 19 + url = "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"; 20 20 flake = false; 21 + }; 22 + ibm-plex-mono-src = { 23 + url = "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-mono%401.1.0/ibm-plex-mono.zip"; 24 + flake = false; 21 25 }; 22 26 gitignore = { 23 27 url = "github:hercules-ci/gitignore.nix"; ··· 32 36 htmx-src, 33 37 lucide-src, 34 38 gitignore, 35 - ia-fonts-src, 39 + inter-fonts-src, 40 + ibm-plex-mono-src, 36 41 }: let 37 42 supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; 38 43 forAllSystems = nixpkgs.lib.genAttrs supportedSystems; ··· 74 79 mkdir -p appview/pages/static/{fonts,icons} 75 80 cp -f ${htmx-src} appview/pages/static/htmx.min.js 76 81 cp -rf ${lucide-src}/*.svg appview/pages/static/icons/ 77 - cp -f ${ia-fonts-src}/"iA Writer Quattro"/Static/*.ttf appview/pages/static/fonts/ 78 - cp -f ${ia-fonts-src}/"iA Writer Mono"/Static/*.ttf appview/pages/static/fonts/ 82 + cp -f ${inter-fonts-src}/Inter/web/InterVariable*.woff2 appview/pages/static/fonts/ 83 + cp -f ${inter-fonts-src}/Inter/web/InterDisplay*.woff2 appview/pages/static/fonts/ 84 + cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono-Regular.woff2 appview/pages/static/fonts/ 79 85 ${pkgs.tailwindcss}/bin/tailwindcss -i input.css -o appview/pages/static/tw.css 80 86 popd 81 87 ''; ··· 153 159 mkdir -p appview/pages/static/{fonts,icons} 154 160 cp -f ${htmx-src} appview/pages/static/htmx.min.js 155 161 cp -rf ${lucide-src}/*.svg appview/pages/static/icons/ 156 - cp -f ${ia-fonts-src}/"iA Writer Quattro"/Static/*.ttf appview/pages/static/fonts/ 157 - cp -f ${ia-fonts-src}/"iA Writer Mono"/Static/*.ttf appview/pages/static/fonts/ 162 + cp -f ${inter-fonts-src}/web/InterVariable*.woff2 appview/pages/static/fonts/ 163 + cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 appview/pages/static/fonts/ 164 + cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono-Regular.woff2 appview/pages/static/fonts/ 158 165 ''; 159 166 }; 160 167 });
+8 -80
input.css
··· 3 3 @tailwind utilities; 4 4 @layer base { 5 5 @font-face { 6 - font-family: "iA Writer Quattro S"; 7 - src: url("/static/fonts/iAWriterQuattroS-Regular.ttf") 8 - format("truetype"); 6 + font-family: "InterVariable"; 7 + src: url("/static/fonts/InterVariable.woff2") format("woff2"); 9 8 font-weight: normal; 10 9 font-style: normal; 11 10 font-display: swap; 12 - font-feature-settings: 13 - "calt" 1, 14 - "kern" 1; 15 11 } 16 - @font-face { 17 - font-family: "iA Writer Quattro S"; 18 - src: url("/static/fonts/iAWriterQuattroS-Bold.ttf") format("truetype"); 19 - font-weight: bold; 20 - font-style: normal; 21 - font-display: swap; 22 - font-feature-settings: 23 - "calt" 1, 24 - "kern" 1; 25 - } 12 + 26 13 @font-face { 27 - font-family: "iA Writer Quattro S"; 28 - src: url("/static/fonts/iAWriterQuattroS-Italic.ttf") format("truetype"); 14 + font-family: "InterVariable"; 15 + src: url("/static/fonts/InterVariable-Italic.woff2") format("woff2"); 29 16 font-weight: normal; 30 17 font-style: italic; 31 18 font-display: swap; 32 - font-feature-settings: 33 - "calt" 1, 34 - "kern" 1; 35 - } 36 - @font-face { 37 - font-family: "iA Writer Quattro S"; 38 - src: url("/static/fonts/iAWriterQuattroS-BoldItalic.ttf") 39 - format("truetype"); 40 - font-weight: bold; 41 - font-style: italic; 42 - font-display: swap; 43 - font-feature-settings: 44 - "calt" 1, 45 - "kern" 1; 46 19 } 47 20 48 21 @font-face { 49 - font-family: "iA Writer Mono S"; 50 - src: url("/static/fonts/iAWriterMonoS-Regular.ttf") format("truetype"); 51 - font-weight: normal; 52 - font-style: normal; 53 - font-display: swap; 54 - font-feature-settings: 55 - "calt" 1, 56 - "kern" 1; 57 - } 58 - @font-face { 59 - font-family: "iA Writer Mono S"; 60 - src: url("/static/fonts/iAWriterMonoS-Bold.ttf") format("truetype"); 61 - font-weight: bold; 62 - font-style: normal; 63 - font-display: swap; 64 - font-feature-settings: 65 - "calt" 1, 66 - "kern" 1; 67 - } 68 - @font-face { 69 - font-family: "iA Writer Mono S"; 70 - src: url("/static/fonts/iAWriterMonoS-Italic.ttf") format("truetype"); 22 + font-family: "IBMPlexMono"; 23 + src: url("/static/fonts/IBMPlexMono-Regular.woff2") format("woff2"); 71 24 font-weight: normal; 72 25 font-style: italic; 73 26 font-display: swap; 74 - font-feature-settings: 75 - "calt" 1, 76 - "kern" 1; 77 - } 78 - @font-face { 79 - font-family: "iA Writer Mono S"; 80 - src: url("/static/fonts/iAWriterMonoS-BoldItalic.ttf") 81 - format("truetype"); 82 - font-weight: bold; 83 - font-style: italic; 84 - font-display: swap; 85 - font-feature-settings: 86 - "calt" 1, 87 - "kern" 1; 88 27 } 89 28 90 - @font-face { 91 - font-family: "Inter"; 92 - font-style: normal; 93 - font-weight: 400; 94 - font-display: swap; 95 - font-feature-settings: 96 - "calt" 1, 97 - "kern" 1; 98 - } 99 29 ::selection { 100 30 @apply bg-yellow-400 text-black bg-opacity-30 dark:bg-yellow-600 dark:bg-opacity-50 dark:text-white; 101 31 } 102 32 103 33 @layer base { 104 34 html { 105 - letter-spacing: -0.01em; 106 - word-spacing: -0.07em; 107 - font-size: 14px; 35 + font-size: 15px; 108 36 } 109 37 a { 110 38 @apply no-underline text-black hover:underline hover:text-gray-800 dark:text-white dark:hover:text-gray-300;
+45 -36
tailwind.config.js
··· 2 2 const colors = require("tailwindcss/colors"); 3 3 4 4 module.exports = { 5 - content: ["./appview/pages/templates/**/*.html", "./appview/pages/chroma.go"], 6 - darkMode: "media", 7 - theme: { 8 - container: { 9 - padding: "2rem", 10 - center: true, 11 - screens: { 12 - sm: "500px", 13 - md: "600px", 14 - lg: "800px", 15 - xl: "1000px", 16 - "2xl": "1200px" 17 - }, 18 - }, 19 - extend: { 20 - fontFamily: { 21 - sans: ["iA Writer Quattro S", "Inter", "system-ui", "sans-serif", "ui-sans-serif"], 22 - mono: ["iA Writer Mono S", "ui-monospace", "SFMono-Regular", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", "monospace"], 23 - }, 24 - typography: { 25 - DEFAULT: { 26 - css: { 27 - maxWidth: 'none', 28 - pre: { 29 - backgroundColor: colors.gray[100], 30 - color: colors.black, 31 - '@apply dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700 dark:border': {} 32 - }, 33 - }, 34 - }, 35 - }, 36 - }, 37 - }, 38 - plugins: [ 39 - require('@tailwindcss/typography'), 40 - ] 5 + content: ["./appview/pages/templates/**/*.html", "./appview/pages/chroma.go"], 6 + darkMode: "media", 7 + theme: { 8 + container: { 9 + padding: "2rem", 10 + center: true, 11 + screens: { 12 + sm: "500px", 13 + md: "600px", 14 + lg: "800px", 15 + xl: "1000px", 16 + "2xl": "1200px", 17 + }, 18 + }, 19 + extend: { 20 + fontFamily: { 21 + sans: ["InterVariable", "system-ui", "sans-serif", "ui-sans-serif"], 22 + mono: [ 23 + "IBMPlexMono", 24 + "ui-monospace", 25 + "SFMono-Regular", 26 + "Menlo", 27 + "Monaco", 28 + "Consolas", 29 + "Liberation Mono", 30 + "Courier New", 31 + "monospace", 32 + ], 33 + }, 34 + typography: { 35 + DEFAULT: { 36 + css: { 37 + maxWidth: "none", 38 + pre: { 39 + backgroundColor: colors.gray[100], 40 + color: colors.black, 41 + "@apply dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700 dark:border": 42 + {}, 43 + }, 44 + }, 45 + }, 46 + }, 47 + }, 48 + }, 49 + plugins: [require("@tailwindcss/typography")], 41 50 };