Skip to content
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"dependencies": {
"@tanstack/angular-table": "^8.21.4",
"@tedi-design-system/core": "6.11.2"
"@tedi-design-system/core": "6.12.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "20.3.27",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.tedi-checkbox {
--_checkbox-bg: var(--form-checkbox-radio-default-background-default);
--_checkbox-border: var(--form-checkbox-radio-default-border-default);
--_checkbox-bg: var(--form-choice-checkbox-unselected-default);
--_checkbox-border: var(--form-choice-checkbox-unselected-border-default);
--_checkbox-label-color: var(--general-text-primary);
--_checkbox-check-color: var(--_checkbox-border);
--_checkbox-inner-spacing: var(--form-checkbox-radio-inner-spacing);
Expand Down Expand Up @@ -55,20 +55,23 @@
}

&:has(input:checked, input:indeterminate) {
--_checkbox-bg: var(--form-checkbox-radio-default-background-selected);
--_checkbox-border: var(--form-checkbox-radio-default-border-selected);
--_checkbox-bg: var(--form-choice-checkbox-selected-default);
--_checkbox-border: var(--form-choice-checkbox-selected-border-default);
}

&:has(input:hover, input:focus-visible) {
.tedi-checkbox__indicator {
outline: 1px solid var(--_checkbox-border);
}
--_checkbox-border: var(--form-checkbox-radio-default-border-hover);
--_checkbox-border: var(--form-choice-checkbox-unselected-border-hover);
}

&:has(input:active) {
--_checkbox-border: var(--form-checkbox-radio-default-border-active);
--_checkbox-bg: var(--form-checkbox-radio-default-background-active);
--_checkbox-border: var(--form-choice-checkbox-unselected-border-active);
}

&:has(input:checked:active, input:indeterminate:active) {
--_checkbox-bg: var(--form-choice-checkbox-selected-active);
Comment thread
ly-tempel-bitweb marked this conversation as resolved.
Resolved
}

&:has(input:disabled) {
Expand All @@ -78,17 +81,14 @@
--_checkbox-border: var(--form-input-border-disabled);
}

&:has(input:disabled:checked) {
--_checkbox-bg: var(
--form-checkbox-radio-default-background-selected-disabled
);
--_checkbox-border: var(
--form-checkbox-radio-default-border-selected-disabled
);
&:has(input:disabled:checked, input:disabled:indeterminate) {
--_checkbox-bg: var(--form-choice-checkbox-selected-disabled);
--_checkbox-border: var(--form-choice-checkbox-selected-border-disabled);
}

&--error {
--_checkbox-bg: var(--form-checkbox-radio-default-background-error);
// Error colours apply to unselected boxes only; selected ones keep their fill
&--error:has(input:not(:checked, :indeterminate, :disabled)) {
--_checkbox-bg: var(--form-choice-checkbox-unselected-default);
--_checkbox-border: var(--form-general-feedback-error-border);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,74 +21,85 @@
@mixin color-variables($variant) {
:is(.tedi-radio, .tedi-checkbox) {
--_choicegroup-card-bg: var(
--form-checkbox-radio-card-#{$variant}-default-background
--form-choice-card-#{$variant}-unselected-background-default
);
--_radio-label-color: var(
--form-checkbox-radio-card-#{$variant}-default-text
--form-choice-card-#{$variant}-unselected-text-default
);
--_checkbox-label-color: var(
--form-checkbox-radio-card-#{$variant}-default-text
--form-choice-card-#{$variant}-unselected-text-default
);

&:has(input:checked) {
--_choicegroup-card-bg: var(
--form-checkbox-radio-card-#{$variant}-selected-background
--form-choice-card-#{$variant}-selected-background-default
);
--_radio-label-color: var(
--form-checkbox-radio-card-#{$variant}-selected-text
--form-choice-card-#{$variant}-selected-text-default
);
--_checkbox-label-color: var(
--form-checkbox-radio-card-#{$variant}-selected-text
--form-choice-card-#{$variant}-selected-text-default
);
}

&:has(input:hover) {
--_choicegroup-card-bg: var(
--form-checkbox-radio-card-#{$variant}-hover-background
--form-choice-card-#{$variant}-unselected-background-hover
);
--_radio-label-color: var(
--form-checkbox-radio-card-#{$variant}-hover-text
--form-choice-card-#{$variant}-unselected-text-hover
);
--_checkbox-label-color: var(
--form-checkbox-radio-card-#{$variant}-hover-text
--form-choice-card-#{$variant}-unselected-text-hover
);
}

&:has(input:disabled) {
--_choicegroup-card-bg: var(
--form-checkbox-radio-card-#{$variant}-disabled-background
--form-choice-card-#{$variant}-unselected-background-disabled
);
--_radio-label-color: var(
--form-checkbox-radio-card-#{$variant}-disabled-text
--form-choice-card-#{$variant}-unselected-text-disabled
);
--_checkbox-label-color: var(
--form-checkbox-radio-card-#{$variant}-disabled-text
--form-choice-card-#{$variant}-unselected-text-disabled
);
}
}
}

@mixin border-colors($variant, $border-type) {
$unselected-border: if(
$border-type == "border-separate",
"border-borderless",
"border-default"
);
$selected-border: if(
$border-type == "border-separate",
"background-default",
"border-default"
);

:is(.tedi-radio, .tedi-checkbox) {
--_choicegroup-card-border: var(
--form-checkbox-radio-card-#{$variant}-default-#{$border-type}
--form-choice-card-#{$variant}-unselected-#{$unselected-border}
);

&:has(input:checked) {
--_choicegroup-card-border: var(
--form-checkbox-radio-card-#{$variant}-selected-#{$border-type}
--form-choice-card-#{$variant}-selected-#{$selected-border}
);
}

&:has(input:hover) {
--_choicegroup-card-border: var(
--form-checkbox-radio-card-#{$variant}-hover-border
--form-choice-card-#{$variant}-unselected-border-hover
);
}

&:has(input:disabled) {
--_choicegroup-card-border: var(
--form-checkbox-radio-card-#{$variant}-disabled-#{$border-type}
--form-choice-card-#{$variant}-unselected-border-disabled
);
}
}
Expand Down
14 changes: 4 additions & 10 deletions src/community/components/form/choicegroup/choicegroup.styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

@mixin choicegroup-card-error-variables {
:is(.tedi-radio--error, .tedi-checkbox--error) {
--_choicegroup-card-bg: var(--form-checkbox-radio-default-background-error);
--_choicegroup-card-bg: var(--form-general-background-default);
--_choicegroup-card-border: var(--form-general-feedback-error-border);
}
}
Expand Down Expand Up @@ -35,18 +35,12 @@
:is(.tedi-radio, .tedi-checkbox):has(input:checked) {
--_radio-bg: transparent;
--_checkbox-bg: transparent;
--_radio-border: var(
--form-checkbox-radio-default-border-selected-inverted
);
--_checkbox-border: var(
--form-checkbox-radio-default-border-selected-inverted
);
--_radio-border: var(--form-choice-checkbox-selected-border-inverted);
--_checkbox-border: var(--form-choice-checkbox-selected-border-inverted);
}

.tedi-checkbox:has(input:active) {
--_checkbox-border: var(
--form-checkbox-radio-default-border-selected-inverted
);
--_checkbox-border: var(--form-choice-checkbox-selected-border-inverted);
}

&.tedi-choicegroup--stacked {
Expand Down
20 changes: 8 additions & 12 deletions src/community/components/form/radio/radio/radio.component.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.tedi-radio {
--_radio-bg: var(--form-checkbox-radio-default-background-default);
--_radio-border: var(--form-checkbox-radio-default-border-default);
--_radio-bg: var(--form-choice-radio-unselected-background-default);
--_radio-border: var(--form-choice-radio-unselected-border-default);
--_radio-label-color: var(--general-text-primary);
--_radio-dot-bg: var(--_radio-border);
--_radio-dot-size: 12px;
Expand Down Expand Up @@ -63,18 +63,18 @@
.tedi-radio__indicator::after {
display: block;
}
--_radio-border: var(--form-checkbox-radio-default-border-selected);
--_radio-border: var(--form-choice-radio-selected-border-default);
}

&:has(input:hover, input:focus-visible) {
.tedi-radio__indicator {
outline: 1px solid var(--_radio-border);
}
--_radio-border: var(--form-checkbox-radio-default-border-hover);
--_radio-border: var(--form-choice-radio-unselected-border-hover);
}

&:has(input:active) {
--_radio-border: var(--form-checkbox-radio-default-border-active);
--_radio-border: var(--form-choice-radio-unselected-border-active);
}

&:has(input:disabled) {
Expand All @@ -85,16 +85,12 @@
}

&:has(input:disabled:checked) {
--_radio-dot-bg: var(
--form-checkbox-radio-default-background-selected-disabled
);
--_radio-border: var(
--form-checkbox-radio-default-border-selected-disabled
);
--_radio-dot-bg: var(--form-choice-radio-selected-indicator-disabled);
--_radio-border: var(--form-choice-radio-selected-border-disabled);
}

&--error {
--_radio-bg: var(--form-checkbox-radio-default-background-error);
--_radio-bg: var(--form-choice-radio-unselected-background-default);
--_radio-border: var(--form-general-feedback-error-border);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
}

&--disabled {
--_step-indicator-background: var(--stepper-step-disabled-bg, #d2d3d8);
--_step-indicator-background: var(--stepper-step-disabled-background, #d2d3d8);
--_step-indicator-color: var(
--stepper-item-vertical-text-disabled,
#9293a4
Expand All @@ -261,7 +261,7 @@
}

&--informative {
--_step-indicator-background: var(--stepper-step-disabled-bg, #d2d3d8);
--_step-indicator-background: var(--stepper-step-disabled-background, #d2d3d8);
--_step-indicator-border: var(--stepper-step-disabled-border, #9293a4);
--_step-title-color: var(--general-text-tertiary, #5d6071);
#{$host-class}__title {
Expand Down
2 changes: 1 addition & 1 deletion src/community/text-editor/text-editor.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
border-radius: var(--tedi-radius-02-default);

&:hover {
background-color: var(--general-surface-hover);
background-color: var(--general-state-hover);
}

&.ql-active {
Expand Down
24 changes: 12 additions & 12 deletions src/tedi/components/buttons/button/button.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,18 @@
}

&--primary-button-group {
--_btn-text: var(--button-group-primary-inactive-text);
--_btn-bg: var(--button-group-primary-inactive-background);
--_btn-border: var(--button-group-primary-inactive-border);
--_btn-text: var(--button-group-primary-unselected-text);
--_btn-bg: var(--button-group-primary-unselected-background);
--_btn-border: var(--button-group-primary-unselected-border);
--_btn-hover-text: var(--button-group-primary-hover-text);
--_btn-hover-bg: var(--button-group-primary-hover-background);
--_btn-hover-border: var(--button-group-primary-hover-border);
--_btn-active-text: var(--button-group-primary-selected-text);
--_btn-active-bg: var(--button-group-primary-selected-background);
--_btn-active-border: var(--button-group-primary-selected-border);
--_btn-focus-text: var(--button-group-primary-inactive-text);
--_btn-focus-bg: var(--button-group-primary-inactive-background);
--_btn-focus-border: var(--button-group-primary-inactive-border);
--_btn-focus-text: var(--button-group-primary-unselected-text);
--_btn-focus-bg: var(--button-group-primary-unselected-background);
--_btn-focus-border: var(--button-group-primary-unselected-border);
--_btn-disabled-text: var(--button-group-primary-disabled-text);
--_btn-disabled-bg: var(--button-group-primary-disabled-background);
--_btn-disabled-border: var(--button-group-primary-disabled-border);
Expand All @@ -79,18 +79,18 @@
}

&--secondary-button-group {
--_btn-text: var(--button-group-secondary-inactive-text);
--_btn-bg: var(--button-group-secondary-inactive-background);
--_btn-border: var(--button-group-secondary-inactive-border);
--_btn-text: var(--button-group-secondary-unselected-text);
--_btn-bg: var(--button-group-secondary-unselected-background);
--_btn-border: var(--button-group-secondary-unselected-border);
--_btn-hover-text: var(--button-group-secondary-hover-text);
--_btn-hover-bg: var(--button-group-secondary-hover-background);
--_btn-hover-border: var(--button-group-secondary-hover-border);
--_btn-active-text: var(--button-group-secondary-selected-text);
--_btn-active-bg: var(--button-group-secondary-selected-background);
--_btn-active-border: var(--button-group-secondary-selected-border);
--_btn-focus-text: var(--button-group-secondary-inactive-text);
--_btn-focus-bg: var(--button-group-secondary-inactive-background);
--_btn-focus-border: var(--button-group-secondary-inactive-border);
--_btn-focus-text: var(--button-group-secondary-unselected-text);
--_btn-focus-bg: var(--button-group-secondary-unselected-background);
--_btn-focus-border: var(--button-group-secondary-unselected-border);
--_btn-disabled-text: var(--button-group-secondary-disabled-text);
--_btn-disabled-bg: var(--button-group-secondary-disabled-background);
--_btn-disabled-border: var(--button-group-secondary-disabled-border);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
cursor: pointer;

&:hover {
background: var(--general-surface-hover);
background: var(--general-state-hover);
}

&:active {
Expand Down
2 changes: 1 addition & 1 deletion src/tedi/components/content/accordion/accordion.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ hasn't met yet (incomplete prerequisites, missing permissions, etc.).

.step-number--disabled {
border-color: var(--stepper-step-disabled-border);
background: var(--stepper-step-disabled-bg);
background: var(--stepper-step-disabled-background);
}

.step-body {
Expand Down
Loading
Loading