Diff UI update#152
Merged
Merged
Conversation
ericmj
reviewed
Apr 14, 2026
Member
ericmj
left a comment
There was a problem hiding this comment.
This looks really great! Some notes below:
- Let's increase the contrast on the diff, for example it's a bit hard to differentiate the green and red background on added/removed lines
- The logo image and font does not match hex.pm
- Let's remove the github link in the header and instead move it to the footer like on hex.pm, I think we should have the footers look exactly the same on hex.pm and diff.hex.pm
- Can you add a dark theme with a selector in the navbar like we have on hex.pm
Contributor
Author
|
@ericmj done! =) |
- Restore Plausible plausible.init({endpoint}) inline script
- Fix Tailwind v4 placeholder utility (placeholder:text-grey-300)
- Use grey-200 instead of slate-200 in footer social link
- Render copyright year dynamically
- Live-reload also watches lib/diff_web/components/
The branch was rebased over hexpm#160 ("Support ignoring whitespace in diffs") which added the diff_options/ignore_whitespace? helpers and the whitespace_toggle_label/whitespace_toggle_url view helpers. Wire the toggle into the new Tailwind stats header so ?w=1 retains the visible UI it had on the legacy template. The pluralize/3 helper turns the singular case (1 file) into "file", so test assertions for "files changed" can't match for total=1. Loosen the matcher to "changed" and switch the lingering :timer.sleep spot to assert_eventually.
Tailwind v4 in assets/css/app.css declares @source "../../lib" to scan HEEx templates for class usage. The previous order ran mix assets.deploy before COPY lib lib, so Tailwind produced a stylesheet missing nearly all template classes — visible as broken styling on diff.staging.hex.pm. preview/Dockerfile already copies lib first; mirror that here.
The header and footer wordmarks rendered the full "hexdiff" string in bold. Move font-bold to just the "hex" prefix so the brand half pops and the product name renders in normal weight.
Resolved conflicts: - assets/package.json, assets/yarn.lock: kept as deleted (the esbuild migration on this branch removed yarn/webpack; dependabot's @babel/preset-env bump no longer applies). - mix.lock: took sentry 13.0.1 and telemetry 1.4.2 from main while keeping the esbuild-related additions (req, tailwind) from this branch.
Wire in the same Makeup stack used by hexpm (makeup 1.2, makeup_elixir, makeup_erlang, makeup_gleam, makeup_syntect) and run each diff line through Makeup.highlight_inner_html/2. The lexer is picked once per file via Makeup.Registry.fetch_lexer_by_extension/1, with the special cases for rebar.config / *.app.src that match hexpm/preview. Bundle hexpm's GitHub Dark makeup.css verbatim and neutralize its wrapper rules on .ghd-text-user.highlight so only the token color classes apply — diff line layout and add/remove backgrounds are kept.
The bundled theme was hexpm's GitHub Dark colors (designed for hexpm's forced dark .highlight background). On diff pages the .highlight wrapper is transparent so add/remove line backgrounds show through, which left light-mode users staring at #a5d6ff strings on white. Add GitHub Light token colors as the default and gate the dark palette behind [data-theme=dark].
Member
|
This is great! Thank you @paulo-valim 💜 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://www.loom.com/share/f86aeb00e93941b58f6d6fe8d5423d9b