From 2418e43545ac3005371be2ebbcff6c924f6d77b9 Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Thu, 19 Nov 2026 00:26:29 -0800 Subject: [PATCH 1/2] Vue kit: bare is for skins that set their own padding; pin the CCTV and Inspector close load order; changelog for #1840 Co-authored-by: Manjunath Paparaju --- changelog.d/1840-kit-close-button.md | 3 +++ docs/VUE-MIGRATION.md | 4 ++-- src/ui/kit/UiCloseButton.vue | 4 ++-- src/ui/kit/kitStyles.test.mjs | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 changelog.d/1840-kit-close-button.md diff --git a/changelog.d/1840-kit-close-button.md b/changelog.d/1840-kit-close-button.md new file mode 100644 index 0000000000..0376fb405c --- /dev/null +++ b/changelog.d/1840-kit-close-button.md @@ -0,0 +1,3 @@ +- Every close, dismiss and clear button in the views is now one kit + component, `UiCloseButton`, with the same look and behaviour as before + (manjunath22466, samehkhamis, #1840). diff --git a/docs/VUE-MIGRATION.md b/docs/VUE-MIGRATION.md index c6969f4277..24b2e2c63a 100644 --- a/docs/VUE-MIGRATION.md +++ b/docs/VUE-MIGRATION.md @@ -53,7 +53,7 @@ never copied: | `UiButton` `variant="action"` | the action surface (`gev-action-button`); `tone="danger"` hovers red, `size="compact"` is the shot-row footprint (on this variant only) | `src/ui/styles/action-button.css` | | `UiButton` `variant="primary"` | the action surface with a group's main-action accent | `src/ui/styles/action-button.css` | | `UiButton` `variant="icon"` | the 22px square glyph button of a panel's collapse toggle | `src/ui/styles/controls.css` | -| `UiCloseButton` | a close, dismiss or clear button: a bare glyph (× with `glyph="times"`, the Material `close` symbol with `glyph="icon"`) with no padding, border or background of its own and a pointer; the site's feature class sets size, colour, hover and any surface, and `bare` leaves the look off for a skin that keeps the browser's padding | `src/ui/styles/close-button.css` | +| `UiCloseButton` | a close, dismiss or clear button: a bare glyph (× with `glyph="times"`, the Material `close` symbol with `glyph="icon"`) with no padding, border or background of its own and a pointer; the site's feature class sets size, colour, hover and any surface, and `bare` leaves the look off for a skin that sets its own padding and border | `src/ui/styles/close-button.css` | | `UiChip` | the read-only chip (a pill of uppercase mono text); `selected` takes the accent | `src/ui/styles/chip.css` | | `UiEmpty` | the one-line empty state (dim mono text), its hint on a line below | `src/ui/styles/empty-state.css` | | `UiBadge` | the read-only badge (`gev-status-badge`) | `src/ui/styles/status-badge.css` | @@ -105,7 +105,7 @@ no tip unless the site passes a `title`; attributes and classes pass through, so each site keeps its id, feature class and look. Every close, dismiss and clear button in the views is one (`src/ui/kit/closeButtons.test.mjs` pins it); Street Level's and the space mission's keep `bare`, since their skins -keep the browser's padding. The close buttons built in script (credits, the +set their own padding and border. The close buttons built in script (credits, the Quebec CCTV overlay, the guide) are not converted yet. `UiSlider` keeps the native range input rather than drawing a `role="slider"` track, so Core's keyboard, form behaviour and styling stay; diff --git a/src/ui/kit/UiCloseButton.vue b/src/ui/kit/UiCloseButton.vue index 56f9bbaa37..febe762d68 100644 --- a/src/ui/kit/UiCloseButton.vue +++ b/src/ui/kit/UiCloseButton.vue @@ -11,8 +11,8 @@ import UiIcon from './UiIcon.vue'; // Core's common look, a bare glyph: no padding, border or background of its // own, and a pointer. Its rule selects one class and loads before the // feature stylesheets, so a feature rule still sets the size, colour, hover -// and any surface. `bare` leaves the kit look off, for a button whose skin -// keeps the browser's own padding. +// and any surface. `bare` leaves the kit look off, for a button whose own +// skin sets its padding and border. const props = defineProps({ /** The accessible name (aria-label). */ label: { type: String, required: true }, diff --git a/src/ui/kit/kitStyles.test.mjs b/src/ui/kit/kitStyles.test.mjs index f1be902814..c210b964df 100644 --- a/src/ui/kit/kitStyles.test.mjs +++ b/src/ui/kit/kitStyles.test.mjs @@ -165,6 +165,8 @@ test('the kit’s skins load before the feature stylesheets that restyle them', ['.ui-close-button,', '.entity-card__close {'], ['.ui-close-button,', '.context-search__clear {'], ['.ui-close-button,', '.key-setup-close {'], + ['.ui-close-button,', '.cctv-popup__close {'], + ['.ui-close-button,', '.view-context__live-off {'], ['.ui-close-button,', '.gev-guide-close {'], ]) { assert.ok( From b3e6c265e8c662eeaa197fc5f3c20699252030dd Mon Sep 17 00:00:00 2001 From: Sameh Khamis Date: Thu, 19 Nov 2026 00:48:57 -0800 Subject: [PATCH 2/2] Add the changelog entry for #1841 Co-authored-by: Manjunath Paparaju --- changelog.d/1841-kit-search-field.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog.d/1841-kit-search-field.md diff --git a/changelog.d/1841-kit-search-field.md b/changelog.d/1841-kit-search-field.md new file mode 100644 index 0000000000..de72045c39 --- /dev/null +++ b/changelog.d/1841-kit-search-field.md @@ -0,0 +1,3 @@ +- The Context panel search and the Layer Finder search are now one kit + component, `UiSearchField`, with the same look and behaviour as before + (manjunath22466, samehkhamis, #1841).