chore(sync): cascade main -> dev #179

Closed

jmiller wants to merge 0 commits from main into dev

pull from: main

merge into: :dev

:main

:dev

:feature/183-integrate-the-self-hosted-mokotranslate-

:feature/184-feat-user-form-display-modes-tabs-accord

:version/02.33.00

:version/02.32.00

:version/02.31.02

:feature/176-feat-first-class-gtranslate-integration-

:feature/178-align-theme-fab-a11y-toolbar-behavior-cs

:version/02.31.00

:version/02.30.00

:version/02.29.12

:rc

:version/02.28.00

:version/02.29.00

Conversation 1 Commits - Files Changed -

jmiller commented 2026-07-19 07:10:35 +00:00

Owner

Copy Link

Copy Source

Automated cascade of main into dev. Auto-merges when conflict-free, auto-resolves VERSION-stamp-only conflicts, otherwise left open for manual resolution.

Automated cascade of main into dev. Auto-merges when conflict-free, auto-resolves VERSION-stamp-only conflicts, otherwise left open for manual resolution.

jmiller added 35 commits 2026-07-19 07:10:35 +00:00

chore: sync auto-bump.yml from Template-Joomla [skip ci] c85cfe4bf1

chore: sync auto-release.yml from Template-Joomla [skip ci] 0f83f984fd

chore: sync branch-cleanup.yml from Template-Joomla [skip ci] 5027c8b910

chore: sync cascade-dev.yml from Template-Joomla [skip ci] bd7312cdf9

chore: sync ci-issue-reporter.yml from Template-Joomla [skip ci] e58423d47d

chore: sync cleanup.yml from Template-Joomla [skip ci] 32e63fe71a

chore: sync issue-branch.yml from Template-Joomla [skip ci] 72f81bc4c2

chore: sync pr-check.yml from Template-Joomla [skip ci] eae36cbb8c

chore: sync pr-metadata-check.yml from Template-Joomla [skip ci] f387cb7df8

chore: sync pre-release.yml from Template-Joomla [skip ci] 894241a5b1

chore: sync rc-revert.yml from Template-Joomla [skip ci] 4e85de71c7

Merge pull request 'release(template): header background theming — opacity, position, dark inversion' (#173) from dev into main be865cbcb6

chore(release): build 02.31.00 [skip ci] bd4306d92b

chore: promote changelog [Unreleased] → [02.31.00] 1de7c4762a

chore: sync issue-branch.yml from Template-Joomla [skip ci] ceaacd583d

chore(version): pre-release bump to 02.31.02-dev [skip ci] 8cddf42d09

Merge pull request #175: release offline header background + header ::before isolation fix + asset cleanup b1b144517b

chore: sync auto-bump.yml from Template-Joomla [skip ci] 189d3fb0c8

chore: sync auto-release.yml from Template-Joomla [skip ci] 1d99dc4734

chore: sync cascade-dev.yml from Template-Joomla [skip ci] f8af41fe4d

chore: sync ci-generic.yml from Template-Joomla [skip ci] 1045cf0203

chore: sync gitleaks.yml from Template-Joomla [skip ci] a2f0b09cd9

chore: sync issue-branch.yml from Template-Joomla [skip ci] ff5b0b67b5

chore: sync notify.yml from Template-Joomla [skip ci] aa2dcc4380

chore: sync pr-check.yml from Template-Joomla [skip ci] add64db995

chore: sync pre-release.yml from Template-Joomla [skip ci] 15ba73e5d3

chore: sync push-notify.yml from Template-Joomla [skip ci] 73efd3190b

chore: sync rc-revert.yml from Template-Joomla [skip ci] a49b3e6501

chore: sync repo-health.yml from Template-Joomla [skip ci] dbcfa40707

chore: sync version-set.yml from Template-Joomla [skip ci] 0833eedc3c

chore: sync pre-release.yml from Template-Joomla [skip ci] 24e25ffe36

fix(template): add gtranslate position + shift theme FAB clear of GTranslate widget ... 164cf91776

- New 'gtranslate' template position (above debug); rendered in index.php
- has-gtranslate body class via countModules('gtranslate')
- Shift #mokoThemeFab .pos-br (right) and .pos-bl (left) by 9.5rem under
  has-gtranslate so the FAB clears the GTranslate floating widget on either
  bottom corner (GTranslate side is set per module settings)

Merge pull request 'fix(template): GTranslate position + theme FAB collision avoidance' (#177) from fix/gtranslate-fab-position into main 6b221c0864

chore(release): build 02.31.02 [skip ci] 68be4160db

chore: promote changelog [Unreleased] → [02.31.02] 044fbeb16b

jmiller added 3 commits 2026-07-19 07:15:19 +00:00

docs(changelog): document offline header background, isolation fix, GTranslate FAB, asset removal 178ddbaebc

chore(version): pre-release bump to 02.31.05-dev [skip ci] 2137d5e04d

Merge pull request 'docs(changelog): catch up [Unreleased] — offline bg, isolation fix, GTranslate, asset removal' (#180) from chore/changelog-catchup into main 586ee59329

jmiller added 1 commit 2026-07-19 07:15:38 +00:00

chore(release): build 02.32.00 [skip ci] 3edc874fe1

jmiller added 1 commit 2026-07-19 07:15:49 +00:00

chore: promote changelog [Unreleased] → [02.32.00] c4817bc212

jmiller added 1 commit 2026-07-19 07:54:06 +00:00

chore: sync auto-release.yml from Template-Joomla [skip ci] b8a925ea07

jmiller added 1 commit 2026-07-19 07:54:08 +00:00

chore: sync issue-branch.yml from Template-Joomla [skip ci] 1c7e96cacd

jmiller added 1 commit 2026-07-19 08:19:54 +00:00

chore: sync auto-release.yml from Template-Joomla [skip ci] c300b53b79

jmiller added 1 commit 2026-07-19 08:22:18 +00:00

chore: sync pre-release.yml from Template-Joomla [skip ci] 43fc1892e3

jmiller added 2 commits 2026-07-19 09:29:19 +00:00

fix(template): stop header navbar white leaking into content menus (.nav-link) ... 7870d1a5c0

The global .nav-link rule colored links with --nav-link-color (the header
navbar's white), making sidebar/footer/bottom menu links invisible (white on
light background) in the light theme. Point the global rule at --link-color
(theme-aware). The header keeps white via its own .container-header .nav-link
rule (higher specificity); drawer (.offcanvas .mod-menu .nav-link) and topbar
have their own rules, so they're unaffected.

Merge pull request 'fix(template): sidebar/footer menu links invisible in light theme (.nav-link color leak)' (#181) from fix/nav-link-color-leak into main fe0c95afd3

jmiller added 1 commit 2026-07-20 13:38:20 +00:00

chore(release): build 02.33.00 [skip ci] 3841c5493a

jmiller added 1 commit 2026-07-21 18:19:12 +00:00

chore: sync auto-release.yml from Template-Joomla [skip ci] c1266d80e9

jmiller added 1 commit 2026-07-21 18:19:15 +00:00

chore: sync issue-branch.yml from Template-Joomla [skip ci] 96aa548721

jmiller commented 2026-07-21 21:18:27 +00:00

Author

Owner

Copy Link

Copy Source

Reconciled manually: main was merged into dev (merge commit 0e5bccb), resolving the version-stamp conflicts by keeping dev's higher 02.33.02 version while preserving all of main's merged content (gtranslate position, nav-link fix, offline theming, etc.). dev is now 0 commits behind main. Closing this cascade PR as fulfilled.

Reconciled manually: `main` was merged into `dev` (merge commit `0e5bccb`), resolving the version-stamp conflicts by keeping `dev`'s higher `02.33.02` version while preserving all of main's merged content (gtranslate position, nav-link fix, offline theming, etc.). `dev` is now 0 commits behind `main`. Closing this cascade PR as fulfilled.

jmiller closed this pull request 2026-07-21 21:18:35 +00:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

automation

Automated processes or scripts

breaking-change

Breaking API or functionality change

build

Build system changes

ci-cd

CI/CD pipeline changes

config

Configuration file changes

css

CSS/styling changes

dependencies

Dependency updates

deploy-failure

Automated deploy failure tracking

docker

Docker configuration changes

documentation

Documentation changes

dolibarr

Dolibarr module or extension

generic

Generic project or library

good first issue

Good for newcomers

health-check

Repository health check results

health: excellent

Health score 90-100

health: fair

Health score 50-69

health: good

Health score 70-89

health: poor

Health score below 50

help wanted

Extra attention needed

html

HTML template changes

javascript

JavaScript code changes

joomla

Joomla extension or component

major-release

Major version release

minor-release

Minor version release

mokostandards

MokoStandards compliance

needs-review

Awaiting code review

patch-release

Patch version release

php

PHP code changes

push-failure

File push failure requiring attention

python

Python code changes

release-candidate

Release candidate build

security

Security-related changes

size/l

Large change (101-300 lines)

size/m

Medium change (31-100 lines)

size/s

Small change (11-30 lines)

size/xl

Extra large change (301-1000 lines)

size/xs

Extra small change (1-10 lines)

size/xxl

Extremely large change (1000+ lines)

standards-drift

Repository drifted from MokoStandards

standards-update

MokoStandards sync update

sync-failure

Bulk sync failure requiring attention

sync-report

Bulk sync run report

template-validation-failure

Template workflow validation failure

tests

Test suite changes

type: bug

Something isn't working

type: chore

Maintenance tasks

type: enhancement

Enhancement to existing feature

type: feature

New feature or request

type: refactor

Code refactoring

type: version

Version-related change

typescript

TypeScript code changes

version

Version bump or release

version-drift

Version mismatch detected

work-in-progress

Work in progress, not ready for merge

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No labels

Priority -

Type -

Milestone

No items

No Milestone

Assignees

Clear assignees

jmiller (Jonathan Miller)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/MokoOnyx#179