fix(branding): app icon follows the Nav Icon upload (#773) #774

Merged

jmiller merged 3 commits from fix/app-icon-follows-nav-icon into main 2026-07-13 00:43:46 +00:00

Conversation 2 Commits 3 Files Changed 3

+68 -25

jmiller commented 2026-07-12 23:45:38 +00:00

Owner

Copy Link

Copy Source

Fixes #773.

The app icon (logo.png) is the 512x512 PWA / web-manifest icon (SiteManifest) and the navbar fallback (head_navbar.tmpl onerror), but it had no Admin Branding control — so a fully branded instance still advertised the shipped default MokoGitea mark as its installable app icon.

Change

• routers/web/admin/branding.go: uploading the Nav Icon now writes the image to both logo-small.png and logo.png in a single io.MultiWriter pass; resetting the Nav Icon removes both, reverting to the built-in default.
• templates/admin/branding.tmpl: note that the Nav Icon also sets the app icon and recommend >=512x512px.

Verification

• go build ./routers/web/admin/: pass.

Fixes #773. The **app icon** (`logo.png`) is the 512x512 PWA / web-manifest icon (`SiteManifest`) and the navbar fallback (`head_navbar.tmpl` `onerror`), but it had no Admin **Branding** control — so a fully branded instance still advertised the shipped default MokoGitea mark as its installable app icon. ### Change - `routers/web/admin/branding.go`: uploading the **Nav Icon** now writes the image to both `logo-small.png` and `logo.png` in a single `io.MultiWriter` pass; resetting the Nav Icon removes both, reverting to the built-in default. - `templates/admin/branding.tmpl`: note that the Nav Icon also sets the app icon and recommend >=512x512px. ### Verification - `go build ./routers/web/admin/`: **pass**.

jmiller added 1 commit 2026-07-12 23:45:39 +00:00

fix(branding): app icon follows the Nav Icon upload ... 3d0cb7d98c

The app icon (logo.png) is the PWA/web-manifest icon and the navbar
fallback, but had no Branding control, so it stayed the shipped default
even on a fully branded instance. Uploading the Nav Icon now also writes
logo.png (single io.MultiWriter pass), and resetting the Nav Icon reverts
both to the built-in default.

Closes #773

jmiller referenced this issue from a commit 2026-07-13 00:02:41 +00:00

refactor(branding): write each icon target independently on upload

jmiller added 1 commit 2026-07-13 00:02:41 +00:00

refactor(branding): write each icon target independently on upload ... f4be31183f

Rewind the uploaded stream between targets and write/close each file in
turn instead of a shared io.MultiWriter, so a failure writing a later
target (e.g. logo.png) can never leave an earlier one (logo-small.png)
truncated. Addresses review feedback on #774.

jmiller commented 2026-07-13 00:17:00 +00:00

Author

Owner

Copy Link

Copy Source

Wiki reminder: docs are wiki-first -- if this PR changes behavior, usage, config, or standards, please update the repo wiki before/after merge. (non-blocking)

<!-- wiki-reminder --> **Wiki reminder:** docs are wiki-first -- if this PR changes behavior, usage, config, or standards, please update the repo wiki before/after merge. _(non-blocking)_

jmiller reviewed 2026-07-13 00:24:26 +00:00

jmiller left a comment

Author

Owner

Copy Link

Copy Source

Code review (targeting main): clean — approve on correctness.

• Upload writes each target independently, rewinding the stream (file.Seek(0, io.SeekStart)) between targets, so a failure on a later target (logo.png) can't leave an earlier one (logo-small.png) truncated. Every file handle is Close()d on all paths (copy-error path closes before return) — no leak.
• Only nav-icon also targets logo.png; favicon/login-logo remain isolated.
• Reset reverts both files with correct failed / removedAny / default flash precedence.
• SVG-strip name[:len(name)-4] is panic-safe (all target names end in .png).

Verified go build ./routers/web/admin/ passes. No code blockers.

⚠️ Do not merge yet — CI red is the offline-runner infra issue, not this change.

**Code review (targeting `main`): clean — approve on correctness.** - Upload writes each target independently, rewinding the stream (`file.Seek(0, io.SeekStart)`) between targets, so a failure on a later target (logo.png) can't leave an earlier one (logo-small.png) truncated. Every file handle is `Close()`d on all paths (copy-error path closes before return) — no leak. - Only `nav-icon` also targets `logo.png`; favicon/login-logo remain isolated. - Reset reverts both files with correct `failed` / `removedAny` / default flash precedence. - SVG-strip `name[:len(name)-4]` is panic-safe (all target names end in `.png`). Verified `go build ./routers/web/admin/` passes. No code blockers. :warning: Do not merge yet — CI red is the offline-runner infra issue, not this change.

jmiller added 1 commit 2026-07-13 00:43:08 +00:00

Merge remote-tracking branch 'origin/main' into fix/app-icon-follows-nav-icon ... dc14a3fcfc

# Conflicts:
#	CHANGELOG.md

jmiller merged commit 3ce6fd3e08 into main 2026-07-13 00:43:46 +00:00

jmiller deleted branch fix/app-icon-follows-nav-icon 2026-07-13 00:43:48 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

jmiller

Labels

Clear labels

breaking-change

Breaking API or behavior change

ci-cd

CI/CD pipeline changes

config

Configuration changes

dependencies

Dependency updates

deploy-failure

Deployment failed

docker

Docker/container changes

documentation

Documentation changes

feature: wiki

Wiki system enhancements

good first issue

Good for newcomers

health-check

Repo health check result

help wanted

Extra attention needed

mokostandards

Related to MokoStandards framework

push-failure

Git push operation failed

security

Security vulnerability or hardening

size/l

200-500 lines changed

size/m

50-200 lines changed

size/s

10-50 lines changed

size/xl

500+ lines changed

size/xs

< 10 lines changed

standards-drift

Deviates from MokoStandards

standards-update

MokoStandards compliance update

sync-failure

Sync or mirror failed

tech-debt

Technical debt and TODO/FIXME items

upstream

upstream

Inherited from upstream Gitea

work-in-progress

Draft or incomplete work

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) moko-deploy (Moko Deploy Bot)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: MokoConsulting/MokoGitea-Fork#774