Skip to content

xiiui ← Fix bookmark icon and color not showing in header#27034

Merged
formfcw merged 124 commits intofeat/twelve-uifrom
florian/cms-2079-fix-bookmark-icon-color-not-showing-in-header
Apr 9, 2026
Merged

xiiui ← Fix bookmark icon and color not showing in header#27034
formfcw merged 124 commits intofeat/twelve-uifrom
florian/cms-2079-fix-bookmark-icon-color-not-showing-in-header

Conversation

@formfcw
Copy link
Copy Markdown
Contributor

@formfcw formfcw commented Apr 2, 2026

Scope

What's changed:

  • Pass bookmark icon and color to localPreset in use-preset.ts so the header bar can read them
  • Extract useCollectionHeader() in collection.vue to derive header title, icon, and color — now bookmark-aware instead of always falling
    through to collection defaults
  • Remove small prop from context toggle button in navigation-bookmark to match the chevron icon sizing

Potential Risks / Drawbacks

Tested Scenarios

  • Bookmark with custom icon and color displays both in the header
  • Bookmark with no custom icon/color falls back default icon/color
  • Bookmark with icon unset, does not show any icon
  • Non-bookmark collection views are unaffected
  • Archive view still shows the archive icon

Review Notes / Questions

  • Core fix is use-preset.ts:108-109icon and color were simply never copied to localPreset
  • The small removal on the context toggle is a design alignment tweak, not part of the bug fix

Checklist

  • Added or updated tests
  • Documentation PR created here or not required
  • OpenAPI package PR created here or not required

Addresses CMS-2079

formfcw and others added 30 commits March 18, 2026 14:43
Review note: Rebuild `pnpm --filter themes build`
… components

Review note: Rebuild `pnpm --filter composables --filter themes --filter types build`

Docs note: sidebarShadow and headerShadow prop removed from defineLayout()
…ll type scales

Review note: Rebuild `pnpm --filter themes --filter types build`
- v-text-overflow.vue (line-height: normal)
- v-card-title.vue (font-weight, line-height)
- form-field-label.vue (scoped .type-label, magic numbers → --label-height)
- form-field.vue (link underline)
- user-popover.vue (status chip margin)
…n theme types

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…in theme defs

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…cus ring

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
… ring

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…e--primary

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Review note: Test e.g. in data model settings > <collection> > display template
Review note: In the new design there won’t be a default border for this element, that’s why I’ve already removed it here.
@linear
Copy link
Copy Markdown

linear Bot commented Apr 2, 2026

@formfcw formfcw requested a review from HZooly April 2, 2026 15:59
Copy link
Copy Markdown
Member

@HZooly HZooly left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two minor things about the fallbacks not working as expected

Comment thread app/src/modules/content/routes/collection.vue
Comment thread app/src/modules/content/routes/collection.vue
@formfcw formfcw requested a review from HZooly April 7, 2026 08:15
Copy link
Copy Markdown
Contributor

@alvarosabu alvarosabu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐧

Base automatically changed from florian/cms-1923-add-header-button-component to feat/twelve-ui April 9, 2026 09:08
@formfcw formfcw merged commit 38dd75f into feat/twelve-ui Apr 9, 2026
3 checks passed
@formfcw formfcw deleted the florian/cms-2079-fix-bookmark-icon-color-not-showing-in-header branch April 9, 2026 09:09
formfcw added a commit that referenced this pull request Apr 9, 2026
Co-authored-by: HZooly <torzuoli.hugo@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants