Skip to content

Update upstream risefor_main/master (2026-09): 121 commits — home/header revamps, actions/scrutins UI, listing improvements

Scaffold Digital Fleet requested to merge chore/update-upstream-2026-09 into risefor_main/master

What

Merge of upstream applications/risefor-front risefor_main/master (121 commits since fc8fbed3, tip bf311dfe) into palestine risefor_main/master.

Highlights: #206 home+header CSS revamps, action-detail choices feature, listing page improvements (law-listing, representative-listing), mobile fixes, 14-day backup retention lineage, scrutin votes front work.

Conflict resolutions

  • _header.scss → upstream #206 revamp (incl. real-iOS :host fix) + palestine logo tweaks re-applied (60px desktop logo, 130px centered mobile logo).
  • _home.scss → fork version kept (palestine home page is the custom home-custom.ts 551-line template which imports _home.scss inline and was tuned against it; upstream revamp targets home.ts which palestine does not use).
  • header.ts → auto-merged, both changes kept (fork risefor-custom-home logo nav + upstream icon-size fix).
  • home-custom.ts untouched by merge (verified present, 551 lines).

Verification (dev, scaffolddev)

  • vite build OK (265 modules).
  • Booted orbit-palestine :5274 + fork vite :5273 against shared :8000 backend (PLUGIN_LAW_TRACKER=False prod-parity).
  • Home: header/menu/hero/custom cards render; logo asset copied to dev static (was a fork-only file, dev-env only).
  • /actions listing renders with cards.

Companion lobbying MR: palestine/risefor-lobbying !1 (merged).

Merge request reports