diff --git a/.changeset/lemon-pillows-yawn.md b/.changeset/lemon-pillows-yawn.md new file mode 100644 index 0000000000..853d812bb3 --- /dev/null +++ b/.changeset/lemon-pillows-yawn.md @@ -0,0 +1,3 @@ +--- + +--- diff --git a/packages/components/src/components/accordion/accordion.ts b/packages/components/src/components/accordion/accordion.ts index 7fe7ac7d73..f6fb460670 100644 --- a/packages/components/src/components/accordion/accordion.ts +++ b/packages/components/src/components/accordion/accordion.ts @@ -41,11 +41,10 @@ import SolidElement from '../../internal/solid-element'; * @animation accordion.hide - The animation to use when hiding accordion. You can use `height: auto` with this animation. * * @cssproperty --sd-accordion-border-width - The accordion border width. - * @cssproperty --sd-accordion-color-background - The accordion background color. * @cssproperty --sd-accordion-color-text - The accordion color text. * @cssproperty --sd-accordion-padding-block - The accordion vertical padding value. - * @cssproperty --sd-accordion__chevron-color-text - The accordion chevron color. * @cssproperty --sd-accordion__indicator-color - The accordion indicator color. + * @cssproperty --sd-accordion-color-icon-fill - The accordion icon color. */ @customElement('sd-accordion') export default class SdAccordion extends SolidElement { @@ -246,7 +245,7 @@ export default class SdAccordion extends SolidElement { } [part='summary-icon'] { - color: var(--sd-accordion__chevron-color-text); + fill: rgb(var(--sd-accordion-color-icon-fill)); } ` ]; diff --git a/packages/components/src/components/badge/badge.ts b/packages/components/src/components/badge/badge.ts index 85e569d260..6655a12d5f 100644 --- a/packages/components/src/components/badge/badge.ts +++ b/packages/components/src/components/badge/badge.ts @@ -17,6 +17,7 @@ import SolidElement from '../../internal/solid-element'; * * @cssproperty --sd-badge--blue--inverted-color-background - The background color for the blue badge in its inverted state. * @cssproperty --sd-badge--blue--inverted-color-text - The text color for the blue badge in its inverted state. + * @cssproperty --sd-badge--blue-color-background - The background color for the blue badge in its standard state. * @cssproperty --sd-badge--green-color--inverted-background - The background color for the green badge in its inverted state. * @cssproperty --sd-badge--green-color--inverted-text - The text color for the green badge in its inverted state. * @cssproperty --sd-badge--inverted-color-border - The border color used in inverted state. @@ -47,7 +48,7 @@ export default class SdBadge extends SolidElement { { /* variants */ blue: !this.inverted - ? 'text-white bg-primary-500 border-white' + ? 'text-white sd-badge--blue-color-background border-white' : 'sd-badge--blue--inverted-color-text sd-badge--blue--inverted-color-background sd-badge--inverted-color-border', green: !this.inverted ? 'text-white sd-badge--green-color-background border-white' diff --git a/packages/components/src/components/brandshape/brandshape.ts b/packages/components/src/components/brandshape/brandshape.ts index 2fd0aee7c3..bef20faa55 100644 --- a/packages/components/src/components/brandshape/brandshape.ts +++ b/packages/components/src/components/brandshape/brandshape.ts @@ -146,9 +146,9 @@ export default class SdBrandshape extends SolidElement { part="shape-middle" class=${cx( { - 'neutral-100': 'bg-neutral-100', + 'neutral-100': 'sd-brandshape--neutral-100-color-background', primary: 'bg-primary', - white: 'bg-white', + white: 'sd-brandshape--white-color-background', 'border-white': 'bg-transparent', 'border-primary': 'bg-transparent', image: 'bg-transparent' @@ -176,9 +176,9 @@ export default class SdBrandshape extends SolidElement { return html`
@@ -405,15 +424,15 @@ export default class SdButton extends SolidElement implements SolidFormControl { { primary: !this.inverted ? 'sd-button--primary--hover-color-background group-active:bg-primary-800' - : 'sd-button--primary--inverted--hover-color-background group-active:bg-primary-200', + : 'sd-button--primary--inverted--hover-color-background group-active:sd-button--primary--inverted--active-color-background', secondary: !this.inverted ? 'sd-button--secondary--hover-color-background group-active:sd-button--secondary--active-color-background' - : 'bg-primary-500 group-active:sd-button--secondary--inverted--active-color-background', + : 'sd-button--secondary--inverted--hover-color-background group-active:sd-button--secondary--inverted--active-color-background group-active:sd-button--secondary--inverted--active-color-text', tertiary: !this.inverted ? 'sd-button--tertiary--hover-color-background group-active:sd-button--tertiary--active-color-background' - : 'bg-primary-500 group-active:sd-button--tertiary--inverted--active-color-background', + : 'sd-button--tertiary--inverted--hover-color-background group-active:sd-button--tertiary--inverted--active-color-background group-active:sd-button--tertiary--inverted--active-color-text', cta: !this.inverted - ? 'bg-accent-550 group-active:bg-accent-700' + ? 'bg-accent-500 group-active:bg-accent-700' : 'sd-button--cta--inverted--hover-color-background group-active:sd-button--cta--inverted--active-color-background' }[this.variant] )}>
@@ -422,15 +441,15 @@ export default class SdButton extends SolidElement implements SolidFormControl { { primary: !this.inverted ? 'sd-button--primary--hover-color-background group-active:bg-primary-800' - : 'sd-button--primary--inverted--hover-color-background group-active:bg-primary-200', + : 'sd-button--primary--inverted--hover-color-background group-active:sd-button--primary--inverted--active-color-background', secondary: !this.inverted ? 'sd-button--secondary--hover-color-background group-active:sd-button--secondary--active-color-background' - : 'bg-primary-500 group-active:sd-button--secondary--inverted--active-color-background', + : 'sd-button--secondary--inverted--hover-color-background group-active:sd-button--secondary--inverted--active-color-background group-active:sd-button--secondary--inverted--active-color-text', tertiary: !this.inverted ? 'sd-button--tertiary--hover-color-background group-active:sd-button--tertiary--active-color-background' - : 'bg-primary-500 group-active:sd-button--tertiary--inverted--active-color-background', + : 'sd-button--tertiary--inverted--hover-color-background group-active:sd-button--tertiary--inverted--active-color-background group-active:sd-button--tertiary--inverted--active-color-text', cta: !this.inverted - ? 'bg-accent-550 group-active:bg-accent-700' + ? 'bg-accent-500 group-active:bg-accent-700' : 'sd-button--cta--inverted--hover-color-background group-active:sd-button--cta--inverted--active-color-background' }[this.variant] )}>
diff --git a/packages/components/src/components/checkbox/checkbox.ts b/packages/components/src/components/checkbox/checkbox.ts index a78cd4d1b1..deb05a837d 100644 --- a/packages/components/src/components/checkbox/checkbox.ts +++ b/packages/components/src/components/checkbox/checkbox.ts @@ -36,6 +36,7 @@ import type { SolidFormControl } from '../../internal/solid-element'; * * @cssproperty --sd-checkbox-border-width - The border width of the checkbox. * @cssproperty --sd-form-control-color-border - The color border for form controls. + * @cssproperty --sd-checkbox--checked--hovered-color-border - The border color of the checkbox when checked and hovered. */ @customElement('sd-checkbox') export default class SdCheckbox extends SolidElement implements SolidFormControl { @@ -264,7 +265,7 @@ export default class SdCheckbox extends SolidElement implements SolidFormControl disabled: 'border-neutral-500', visuallyDisabled: 'border-neutral-500', invalidIndeterminate: 'border-error bg-error group-hover:bg-error-400', - invalid: 'border-error group-hover:bg-neutral-200', + invalid: 'border-error group-hover:border-error-400 group-hover:bg-transparent', filled: 'border-accent hover:border-accent-550 group-hover:border-accent-550 bg-accent group-hover:bg-accent-550', default: 'form-control-color-border hover:bg-neutral-200 group-hover:bg-neutral-200 bg-white' @@ -287,7 +288,7 @@ export default class SdCheckbox extends SolidElement implements SolidFormControl disabled: '', visuallyDisabled: '', invalidIndeterminate: ' bg-error group-hover:bg-error-400', - invalid: 'group-hover:bg-neutral-200', + invalid: '', filled: 'bg-accent group-hover:bg-accent-550', default: 'hover:bg-neutral-200 group-hover:bg-neutral-200 bg-white' }[checkboxState] @@ -320,11 +321,7 @@ export default class SdCheckbox extends SolidElement implements SolidFormControl id="label" class=${cx( 'select-none inline-block ml-2', - this.disabled || this.visuallyDisabled - ? 'text-neutral-500' - : this.showInvalidStyle - ? 'text-error' - : 'text-black' + this.disabled || this.visuallyDisabled ? 'text-neutral-500' : 'text-black' )} > @@ -336,14 +333,7 @@ export default class SdCheckbox extends SolidElement implements SolidFormControl class=${cx('flex items-center gap-2', this.showInvalidStyle && 'mt-2')} > ${this.showInvalidStyle - ? html` - ` + ? html` ` : ''} ${this.formControlController.renderInvalidMessage(this.size)} @@ -368,6 +358,10 @@ export default class SdCheckbox extends SolidElement implements SolidFormControl :host([required]) #label::after { content: ' *'; } + + [part='invalid-icon'] { + color: rgb(var(--sd-color-icon-fill-error)); + } ` ]; } diff --git a/packages/components/src/components/combobox/combobox.ts b/packages/components/src/components/combobox/combobox.ts index 7aec2df86e..3d2e9473e4 100644 --- a/packages/components/src/components/combobox/combobox.ts +++ b/packages/components/src/components/combobox/combobox.ts @@ -76,6 +76,14 @@ import type SdPopup from '../popup/popup'; * @cssproperty --tag-max-width - Set the maximum width of the tags and to show an ellipsis. Defaults to "15ch" * @cssproperty --sd-form-control--invalid-color-background - The background color for form controls in invalid state. * @cssproperty --sd-form-control-color-text - The text color for form controls. + * @cssproperty --sd-form-control-border-radius - The border radius for form controls. + * @cssproperty --sd-form-control-color-border - The border color for default and readonly form controls. + * @cssproperty --sd-form-control--filled__floating-label-color-text - The text color for the floating label when the input is filled. + * @cssproperty --sd-form-control__listbox-border-bottom-left-radius - The border radius for the bottom left corner of the listbox. + * @cssproperty --sd-form-control__listbox-border-bottom-right-radius - The border radius for the bottom right corner of the listbox. + * @cssproperty --sd-form-control__listbox-border-top-left-radius - The border radius for the top left corner of the listbox. + * @cssproperty --sd-form-control__listbox-border-top-right-radius - The border radius for the top right corner of the listbox. + * @cssproperty --sd-combobox__tag-border-width - The border width for the tags for multiple options combobox. */ @customElement('sd-combobox') @@ -1195,7 +1203,7 @@ export default class SdCombobox extends SolidElement implements SolidFormControl // Conditional Styles const cursorStyles = this.disabled || this.visuallyDisabled ? 'cursor-not-allowed' : 'cursor-pointer'; - const iconColor = this.disabled || this.visuallyDisabled ? 'text-neutral-500' : 'text-primary'; + const iconColor = this.disabled || this.visuallyDisabled ? 'text-neutral-500' : 'sd-icon-fill-primary'; const iconMarginLeft = { sm: 'ml-1', md: 'ml-2', lg: 'ml-2' }[this.size]; const iconMarginRight = { sm: 'mr-1', md: 'mr-2', lg: 'mr-2' }[this.size]; const iconSize = { @@ -1280,7 +1288,7 @@ export default class SdCombobox extends SolidElement implements SolidFormControl
@@ -1485,7 +1491,7 @@ export default class SdCombobox extends SolidElement implements SolidFormControl ` : html`