Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
bddcdc7
Ignore Lion's initialization event in CheckboxGroup
brianjhanson Aug 20, 2026
c1bc933
Add sortable and allowAll options to the Choice Control
brianjhanson Aug 20, 2026
2873add
Let a ConditionBuilder Control override its add-rule label
brianjhanson Aug 20, 2026
adbd2c6
Return element index sources as Form payloads
brianjhanson Aug 20, 2026
57b3f1a
Correct the modal submit variant and sidebar stacking
brianjhanson Aug 20, 2026
b76bb70
Let a modal be resized by a corner handle
brianjhanson Aug 20, 2026
975231b
Rebuild the customize-sources modal in Vue
brianjhanson Aug 20, 2026
c8a99c5
Render Choice button icons through craft-icon
brianjhanson Aug 20, 2026
da8333c
adjust craft-field-group
brianjhanson Aug 20, 2026
e531349
Extract the customize-sources row list into CustomSourceList
brianjhanson Aug 20, 2026
aaa54b8
Take row actions as a prop on CustomSourceList
brianjhanson Aug 20, 2026
b79c04e
Move row label rendering into CustomSourceList
brianjhanson Aug 20, 2026
b5f0030
Stop the page scrolling behind an open modal
brianjhanson Aug 20, 2026
9452fc7
Keep an open modal from collapsing when its content shrinks
brianjhanson Aug 20, 2026
f0f48fa
Fill the modal when its height floor holds the box open
brianjhanson Aug 20, 2026
134ceec
Add Storybook stories for CustomSourceList
brianjhanson Aug 21, 2026
1bca68c
Reflect craft-action-item's active state, and slot a prefix
brianjhanson Aug 21, 2026
809ba39
Give craft-pane's header a divider and even padding
brianjhanson Aug 21, 2026
e332140
Add a close button to the modal header
brianjhanson Aug 21, 2026
113cdbe
Build source rows on craft-action-item, and carry the row's kind
brianjhanson Aug 21, 2026
78a65b9
Stop loading the legacy customize-sources stylesheet
brianjhanson Aug 21, 2026
6c8b8f2
Stop the source form endpoint shipping the CP asset bootstrap
brianjhanson Aug 21, 2026
0ff1789
Only treat a CustomEvent as a form change when it carries one
brianjhanson Aug 21, 2026
6bcd462
Remove hover on active action items
brianjhanson Aug 21, 2026
71190e6
Remove legacy styles
brianjhanson Aug 21, 2026
a749178
Move Modal's resizing into a useResizableBox composable
brianjhanson Aug 21, 2026
a2da58f
Remove comment
brianjhanson Aug 21, 2026
32dd891
Format ModalForm
brianjhanson Aug 21, 2026
33fda35
Return a style from useResizableBox and give it a handle component
brianjhanson Aug 21, 2026
2130bbd
Merge branch '6.x' of github.com:craftcms/cms into feature/customize-…
brianjhanson Aug 22, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ const config: StorybookConfig = {
'../resources/js/**/*.mdx',
'../resources/js/**/*.stories.@(js|jsx|mjs|ts|tsx)',
],
// `craft-icon` fetches `/vendor/craft/icons/<family>/<name>.svg`, which in the
// CP is a symlink to `cms-assets/resources`. Without this every icon in every
// story 404s and renders nothing.
staticDirs: [
{from: '../cms-assets/resources/icons', to: '/vendor/craft/icons'},
],
addons: [
getAbsolutePath('@storybook/addon-themes'),
getAbsolutePath('@storybook/addon-docs'),
Expand Down
246 changes: 0 additions & 246 deletions packages/craftcms-legacy/cp/src/css/_customize-sources.scss

This file was deleted.

1 change: 0 additions & 1 deletion packages/craftcms-legacy/cp/src/css/craft.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
@import 'hud';
@import 'icon-picker';
@import 'login';
@import 'customize-sources';
@import 'main';
@import 'cp';
@import 'range';
Expand Down
28 changes: 2 additions & 26 deletions packages/craftcms-legacy/cp/src/js/BaseElementIndex.js
Original file line number Diff line number Diff line change
Expand Up @@ -1497,19 +1497,8 @@ Craft.BaseElementIndex = Garnish.Base.extend(
},

getSourceActions: function () {
let actions = [];

if (Craft.userIsAdmin && Craft.allowAdminChanges) {
actions.push({
label: Craft.t('app', 'Customize sources'),
administrative: true,
onSelect: () => {
this.createCustomizeSourcesModal();
},
});
}

return actions;
// "Customize sources" now lives on the Inertia/Vue element index.
return [];
},

updateViewMenu: function () {
Expand Down Expand Up @@ -2987,19 +2976,6 @@ Craft.BaseElementIndex = Garnish.Base.extend(
this.$updateSpinner.remove();
},

createCustomizeSourcesModal: function () {
// Recreate it each time
var modal = new Craft.CustomizeSourcesModal(this, {
hideOnEsc: false,
hideOnShadeClick: false,
onFadeOut: function () {
modal.destroy();
},
});

return modal;
},

disable: function () {
if (this.sourceNav) {
this.sourceNav.disable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default css`
}

@media (hover: hover) {
:host(:hover) .action-item:not(:disabled) {
:host(:hover:not([active])) .action-item:not(:disabled) {
background-color: var(
--c-color-fill-quiet,
var(--c-color-neutral-fill-quiet)
Expand Down Expand Up @@ -91,7 +91,7 @@ export default css`
}

@media (hover: hover) {
:host(:hover[variant='danger']) .action-item:not(:disabled) {
:host(:hover[variant='danger']:not([active])) .action-item:not(:disabled) {
background-color: var(--c-color-fill-quiet);
color: var(--c-color-on-quiet);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default class CraftActionItem extends LitElement {
@property({type: Boolean}) disabled: boolean = false;
@property({reflect: true}) variant: VariantValue = Variant.Neutral;
@property({type: Boolean}) checked: boolean = false;
@property({type: Boolean}) active: boolean = false;
@property({type: Boolean, reflect: true}) active: boolean = false;
@property() type: 'button' | 'checkbox' = 'button';
@property({type: Object}) action: BaseAction | string | null = null;
@property({type: Object}) feedback: ActionFeedback | null = null;
Expand Down Expand Up @@ -193,9 +193,11 @@ export default class CraftActionItem extends LitElement {

renderPrefix() {
const hasIcon = !!this.querySelector('[slot="icon"]') || !!this.icon;
const hasPrefix = !!this.querySelector('[slot="prefix"]');

return html`
${this.type === 'checkbox' ? this.renderCheckbox() : nothing}
${hasPrefix ? html`<slot name="prefix" part="prefix"></slot>` : nothing}
${hasIcon
? html`<div class="action-item__icon">${this.renderIcon()}</div>`
: nothing}
Expand Down
25 changes: 24 additions & 1 deletion packages/craftcms-ui/src/components/field-group/field-group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,37 @@ export default class CraftFieldGroup extends LitElement {
craft-field-group {
display: grid;
grid-template-columns: repeat(12, minmax(0, 1fr));
gap: var(--gap, var(--c-spacing-lg));
gap: var(--gap, var(--c-spacing-lg)) 0;
container-type: inline-size;
}

craft-field-group > * {
grid-column: 1 / -1;
min-width: 0;
}

@container (min-width: 30rem){
craft-field-group > .width-25 {
grid-column: span 3;
}

craft-field-group > .width-33 {
grid-column: span 4;
}

craft-field-group > .width-50 {
grid-column: span 6;
}

craft-field-group > .width-66 {
grid-column: span 6;
}

craft-field-group > .width-75 {
grid-column: span 6;
}

}

@container (min-width: 50rem) {
craft-field-group > .width-25 {
Expand Down
Loading
Loading