Repository navigation
Pull along Tailwind configuration, generating CSS again #617
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
f8369ad
Add back in the original tailwind config
hazelweakly 51d78a5
Restore ability to compile main.css via tailwindcss + postcss
hazelweakly 53c91d1
Document the postcss and tailwind integration in more detail
hazelweakly 0a24741
Don't include node_modules when processing markdown or html files
hazelweakly cdd0f52
Get the CSS appearances as identical as possible (including the quirks)
hazelweakly 0399c75
Put CSS Build into CI
hazelweakly 85e941b
remove bitrotted and unused nix code
hazelweakly 629b0da
update npm packages
dschrempf b5b8543
nits
dschrempf 037a2d7
minimal nix env
dschrempf 964f2d0
Migrate Tailwind to v4 CSS-native config; document CSS workflow
dschrempf 9ca3928
Set headings to regular weight (400); drop unused font-w-800
dschrempf ba9460b
Avoid cat to build tailwind.css
jaspervdj e769aa5
Ignore node_modules in config
jaspervdj bbf1fe0
Mention Nix development shell
dschrempf c9826b7
CI: fail build when dev.css drifts from Tailwind output
dschrempf a4b4790
Isolate Node/Tailwind toolchain in `tools/tailwind/`
dschrempf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| use flake |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,6 +22,11 @@ _site/ | |
| stack.yaml.lock | ||
| dist-newstyle/ | ||
|
|
||
| ### NodeJS ### | ||
| node_modules/ | ||
|
|
||
| ### General ### | ||
| *~ | ||
| .DS_Store | ||
|
|
||
| /.direnv/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /** | ||
| * This is the Tailwind entry point (source). It is NOT overwritten by the | ||
| * build — its compiled *output* lands at _site/assets/css/tailwind.css (see | ||
| * steps below). Only put Tailwind config/directives here; hand-written CSS | ||
| * belongs in assets/css/main.css. | ||
| * | ||
| * NOTE: The underlying implementation details of how this works are as follows | ||
| * 1. tailwindcss needs these directives in order to know where to generate the | ||
| * output | ||
| * 2. first, hakyll is run and copies this source file verbatim to | ||
| * _site/assets/css/tailwind.css | ||
| * 3. then, after hakyll is done, postcss is run on _this_ source | ||
| * assets/css/tailwind.css file. Postcss will, during execution, invoke | ||
| * tailwindcss. tailwindcss (the compiler) will scan all the files in the | ||
| * site for tailwind classes (including _this_ source file). | ||
| * 4. postcss's output file is configured to be _site/assets/css/tailwind.css, | ||
| * so postcss overwrites the copy hakyll made in step 2 with the real, | ||
| * compiled CSS. This source file is never modified. | ||
| */ | ||
|
|
||
| /* | ||
| * Tailwind v4 config lives here (CSS-native), not in tailwind.config.js. | ||
| * `source(none)` disables automatic content detection so only the | ||
| * @source paths below are scanned — mirrors the old | ||
| * topLevelFoldersWithTailwind/topLevelFilesWithTailwind purge.content list. | ||
| * New pages using Tailwind utility classes must add an @source line here, | ||
| * or their classes will be missing from the production build. | ||
| */ | ||
| /* | ||
| * The Node/Tailwind toolchain lives in tools/tailwind/ (see its README), so | ||
| * `node_modules` is not an ancestor of this file and Tailwind's bare-specifier | ||
| * resolution (`@import "tailwindcss"`) can't find it. We therefore point | ||
| * @import/@plugin at the toolchain's node_modules via a relative path. The | ||
| * build itself still runs from the repo root (required — Tailwind's @source | ||
| * only scans at/below the working directory), see tools/tailwind/package.json. | ||
| */ | ||
| @import "../../tools/tailwind/node_modules/tailwindcss/index.css" source(none); | ||
|
|
||
| @source "../../board-nominations/**/*.html"; | ||
| @source "../../contact/**/*.html"; | ||
| @source "../../guidelines-for-respectful-communication/**/*.html"; | ||
| @source "../../resources/**/*.html"; | ||
| @source "../../templates/**/*.html"; | ||
| @source "../../vision/**/*.html"; | ||
| @source "../../whitepaper/**/*.html"; | ||
| @source "../../who-we-are/**/*.html"; | ||
| @source "../../404.html"; | ||
|
|
||
| @plugin "../../tools/tailwind/node_modules/@tailwindcss/typography"; | ||
|
|
||
| /* | ||
| * fontFamily/colors below are the literal values from the Tailwind v2 | ||
| * palette this site was designed against (v2's `gray`/`blue`/`trueGray` | ||
| * colors and `violet`-as-`purple`) — v3/v4 changed the default gray/blue | ||
| * scales and dropped trueGray entirely, so these must be hardcoded rather | ||
| * than aliased to Tailwind's current built-in scales, or the site's colors | ||
| * would shift. main.css's hand-written rgba() values (e.g. `a` link color) | ||
| * are also drawn from this same palette, so keep them in sync. | ||
| */ | ||
| @theme { | ||
| --font-sans: 'Maven Pro', sans-serif; | ||
| --font-serif: 'Playfair Display', serif; | ||
|
|
||
| --border-width-3: 3px; | ||
|
|
||
| --color-gray-50: #fafafa; | ||
| --color-gray-100: #f4f4f5; | ||
| --color-gray-200: #e4e4e7; | ||
| --color-gray-300: #d4d4d8; | ||
| --color-gray-400: #a1a1aa; | ||
| --color-gray-500: #71717a; | ||
| --color-gray-600: #52525b; | ||
| --color-gray-700: #3f3f46; | ||
| --color-gray-800: #27272a; | ||
| --color-gray-900: #18181b; | ||
|
|
||
| --color-blue-50: #eff6ff; | ||
| --color-blue-100: #dbeafe; | ||
| --color-blue-200: #bfdbfe; | ||
| --color-blue-300: #93c5fd; | ||
| --color-blue-400: #60a5fa; | ||
| --color-blue-500: #3b82f6; | ||
| --color-blue-600: #2563eb; | ||
| --color-blue-700: #1d4ed8; | ||
| --color-blue-800: #1e40af; | ||
| --color-blue-900: #1e3a8a; | ||
|
|
||
| --color-trueGray-50: #fafafa; | ||
| --color-trueGray-100: #f5f5f5; | ||
| --color-trueGray-200: #e5e5e5; | ||
| --color-trueGray-300: #d4d4d4; | ||
| --color-trueGray-400: #a3a3a3; | ||
| --color-trueGray-500: #737373; | ||
| --color-trueGray-600: #525252; | ||
| --color-trueGray-700: #404040; | ||
| --color-trueGray-800: #262626; | ||
| --color-trueGray-900: #171717; | ||
|
|
||
| --color-purple-50: #f5f3ff; | ||
| --color-purple-100: #ede9fe; | ||
| --color-purple-200: #ddd6fe; | ||
| --color-purple-300: #c4b5fd; | ||
| --color-purple-400: #a78bfa; | ||
| --color-purple-500: #8b5cf6; | ||
| --color-purple-600: #7c3aed; | ||
| --color-purple-700: #6d28d9; | ||
| --color-purple-800: #5b21b6; | ||
| --color-purple-900: #4c1d95; | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.