From 8c640ef9d09cf1b0b12808e8b18de8889f5b7d9e Mon Sep 17 00:00:00 2001 From: madsCodeBuddy Date: Wed, 29 Apr 2026 05:06:27 +0000 Subject: [PATCH 1/2] fix: restore earth-tone palette in ENERGY_COLORS after PR #30 merge 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. --- docs/build_desert_farm.py | 8 ++++---- docs/desert_farm_stommel.html | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/build_desert_farm.py b/docs/build_desert_farm.py index 5419e07..62e405d 100644 --- a/docs/build_desert_farm.py +++ b/docs/build_desert_farm.py @@ -31,10 +31,10 @@ EXPLORER_N_POINTS = 100 ENERGY_COLORS = { - "Chemical": "#0F793D", - "Radiative": "#FFCC33", - "Thermal": "#CC3333", - "Mechanical": "#336699", + "Chemical": "#7A8C5C", # olive — bonds, reactions, metabolism + "Radiative": "#E5C16E", # warm sand — photons, solar + "Thermal": "#7B3F3F", # deep rust — heat, evaporation, climate + "Mechanical": "#4F6B82", # slate — kinetic, mixing, pumping } ENERGY_ORDER = ["Chemical", "Radiative", "Thermal", "Mechanical"] diff --git a/docs/desert_farm_stommel.html b/docs/desert_farm_stommel.html index efb115f..b125611 100644 --- a/docs/desert_farm_stommel.html +++ b/docs/desert_farm_stommel.html @@ -57,15 +57,15 @@

Operating Across Scale: From Molecules to Climate

chemical (green), radiative (gold), thermal (red), mechanical (blue). Click the legend to toggle energy types on/off.

-
+