fix: restore earth-tone palette eaten by PR #30 merge#32
Merged
madsCodeBuddy merged 2 commits intomainfrom Apr 29, 2026
Merged
Conversation
The merge of PR #30 (refactor) resolved its conflict with PR #28 (earth tones) by taking the refactor branch's old ENERGY_COLORS values (#0F793D / #FFCC33 / #CC3333 / #336699), reverting #28's earth-tone palette in the dict. The CSS footer link color was preserved as #7A8C5C, leaving the file in an inconsistent state where the legend swatches and ellipse fills used the old palette while the page accent used the new one. Restoring the earth-tone palette and regenerating the HTML: Chemical #0F793D -> #7A8C5C (olive) Radiative #FFCC33 -> #E5C16E (warm sand) Thermal #CC3333 -> #7B3F3F (deep rust) Mechanical #336699 -> #4F6B82 (slate) Same palette and same colorblind-safety reasoning as PR #28.
The page header had 'chemical (green), radiative (gold), thermal (red), mechanical (blue)' baked into the prose. After the palette change to olive/sand/rust/slate, that text would describe colors that no longer match the rendered ellipses.
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
1 participant
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.
Summary
The merge of PR #30 (refactor) resolved its conflict with PR #28 (earth tones) by taking the refactor branch's old
ENERGY_COLORSvalues, reverting #28's palette in the dict. The CSS footer link color (#7A8C5C) was preserved, leaving the file inconsistent: legend swatches and ellipse fills use the old palette while the page accent uses the new one.Fix
Restore earth-tone palette in
ENERGY_COLORSand regenerate HTML:#0F793D#7A8C5C(olive)#FFCC33#E5C16E(warm sand)#CC3333#7B3F3F(deep rust)#336699#4F6B82(slate)Same palette and colorblind-safety reasoning as #28 (Machado et al. 2009 CVD simulation, all pairwise luminance gaps ≥20).
Files changed
docs/build_desert_farm.py(4 lines)docs/desert_farm_stommel.htmlregenerated (size unchanged: 219,746 B)Verified