Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion packages/components/src/components/alert/alert.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
}

.db-alert {
@extend %db-bg-neutral-0;
@extend %component-border;
@extend %grid-layout;
display: grid;
Expand Down
5 changes: 1 addition & 4 deletions packages/components/src/components/card/card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
@extend %color-variants;
@extend %default-card;

background-color: var(
--db-current-background-color,
$db-colors-neutral-bg-0-enabled
);
background-color: $db-colors-neutral-bg;

display: flex;
flex-direction: column;
Expand Down
3 changes: 1 addition & 2 deletions packages/components/src/components/checkbox/checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
$font-size-height: calc(var(--db-base-font-size) * var(--db-base-line-height));

.db-checkbox {
@extend %default-color;
@extend %bg-transparent-interactive;

align-content: center;
Expand Down Expand Up @@ -42,7 +41,7 @@ $font-size-height: calc(var(--db-base-font-size) * var(--db-base-line-height));
}

&:checked {
@extend %db-secondary-component-ia;
@extend %db-bg-inverted-ia;

// Check icon
@include icon(glyph(done), 24, "outline");
Expand Down
4 changes: 3 additions & 1 deletion packages/components/src/components/code-docs/code-docs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
@use "@db-ui/foundations/build/scss/color-placeholder" as *;
@use "@db-ui/foundations/build/scss/tonality" as *;

/* TODO: Adapt this colors as well */

%code-docs {
@extend %db-bg-neutral-1;
min-block-size: $db-sizing-3xl;
Expand Down Expand Up @@ -38,7 +40,7 @@
}

.code {
@extend %db-bg-secondary;
@extend %db-bg-neutral-4;
overflow: auto;
position: absolute;
inset-inline-end: 0;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/drawer/drawer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ $spacings: (
@extend %spacing-drawer;
display: flex;
flex-direction: column;
background-color: $db-colors-neutral-bg-0-enabled;
background-color: $db-colors-neutral-bg;
block-size: 100%;
inline-size: 100%;
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/header/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@use "@db-ui/foundations/build/scss/helpers/functions" as *;

.db-header {
background-color: $db-colors-neutral-bg-0-enabled;
background-color: $db-colors-neutral-bg;
box-shadow: $db-elevation-4;
display: flex;
justify-content: space-between;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
@forward "@db-ui/foundations/scss/icon/icons";
@forward "icon";
85 changes: 45 additions & 40 deletions packages/components/src/components/input/input.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@
(
var(--db-input-padding-end-icon-after) +
var(--db-input-padding-end-datalist)
) * #{$db-sizing-md} + #{$db-spacing-fixed-sm} -
var(--db-input-padding-end-datalist) * #{$db-spacing-fixed-sm} - var(
) * #{$db-sizing-md} + #{$db-spacing-fixed-sm} - var(
--db-input-padding-end-datalist
) * #{$db-spacing-fixed-sm} - var(
--db-input-padding-end-icon-after
) * #{$db-spacing-fixed-sm}
);
Expand All @@ -68,6 +69,43 @@
}
}

%input-color-variants {
@each $name, $colors in $component-variants {
@if ($name == "critical") {
&[data-variant="critical"] {
color: map.get($colors, "on-bg");
}
}

&[data-variant="#{$name}"] input {
--db-current-border-color: #{map.get($colors, "border")};
@if ($name == "critical") {
@extend %adaptive-critical-component;
} @else if ($name == "informational") {
@extend %adaptive-informational-component;
} @else if ($name == "warning") {
@extend %adaptive-warning-component;
} @else if ($name == "successful") {
@extend %adaptive-successful-component;
}

& + label {
color: map.get($colors, "on-bg");
}

& ~ .db-icon {
color: map.get($colors, "on-bg");
}

& ~ .description,
& ~ .icon-state,
& ~ .icon-state .db-icon {
color: map.get($colors, "element");
}
}
}
}

.db-input {
--db-input-padding-inline-start: #{$db-spacing-fixed-sm};
--db-input-padding-end-icon-after: 0;
Expand All @@ -76,6 +114,8 @@
--icon-margin-after: 0;
--db-input-label-max-width: 80%;

@extend %input-color-variants;

position: relative;

// padding-inline-end according to current amount of icons
Expand Down Expand Up @@ -157,8 +197,9 @@

.icon-after {
margin-inline-end: calc(
#{$db-spacing-fixed-sm} + var(--db-input-padding-end-datalist) * #{$db-sizing-md} -
var(--db-input-padding-end-datalist) * #{$db-spacing-fixed-sm}
#{$db-spacing-fixed-sm} + var(--db-input-padding-end-datalist) * #{$db-sizing-md} - var(
--db-input-padding-end-datalist
) * #{$db-spacing-fixed-sm}
);
}

Expand All @@ -172,7 +213,6 @@
}

label {
@extend %default-color;
position: absolute;
display: flex;
align-items: center;
Expand Down Expand Up @@ -377,41 +417,6 @@
input[aria-invalid="true"] {
@extend %adaptive-critical-component;
}

@each $name, $colors in $component-variants {
@if ($name == "critical") {
&[data-variant="critical"] {
color: nth($colors, 3);
}
}

&[data-variant="#{$name}"] input {
--db-current-border-color: #{map.get($colors, "border")};
@if ($name == "critical") {
@extend %adaptive-critical-component;
} @else if ($name == "informational") {
@extend %adaptive-informational-component;
} @else if ($name == "warning") {
@extend %adaptive-warning-component;
} @else if ($name == "successful") {
@extend %adaptive-successful-component;
}

& + label {
color: map.get($colors, "on-bg");
}

& ~ .db-icon {
color: $db-colors-informational-on-bg-enabled;
}

& ~ .description,
& ~ .icon-state,
& ~ .icon-state .db-icon {
color: map.get($colors, "element");
}
}
}
}

.db-ui-regular,
Expand Down
27 changes: 19 additions & 8 deletions packages/components/src/components/link/link.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
}

.db-link {
@extend %default-color;
@extend %db-link-height;
inline-size: fit-content;
align-items: center;
Expand All @@ -30,15 +29,19 @@
outline 0.06s,
color $db-transition-color;

&:hover {
color: color-mix(in srgb, transparent 25%, $db-colors-neutral-on-bg);
}

&:active {
color: color-mix(in srgb, transparent 50%, $db-colors-neutral-on-bg);
}

a {
// Workaround for angular
@extend %db-link-height;
}

&:hover {
color: inherit;
}

// "disabled" links
&[aria-disabled="true"] {
// TODO: probably move these to the tokens as well
Expand All @@ -62,7 +65,7 @@

&[data-content="internal"],
&[data-content="external"] {
--icon-margin-before: var(--db-spacing-fixed-2xs);
--icon-margin-before: #{$db-spacing-fixed-2xs};

&:focus-visible {
outline-offset: var(--db-focus-outline-offset, 1px);
Expand All @@ -74,12 +77,20 @@
}

&[data-variant="primary"] {
@extend %db-primary-text-ia;
color: $db-colors-primary;

&:hover {
color: $db-colors-primary-hover;
}

&:active {
color: $db-colors-primary-pressed;
}
}

&[data-size="small"] {
--icon-font-size: var(--db-base-icon-font-size);
--icon-margin-before: var(--db-spacing-fixed-3xs);
--icon-margin-before: #{$db-spacing-fixed-3xs};
@extend %db-overwrite-font-size-sm;
}
}
14 changes: 3 additions & 11 deletions packages/components/src/components/radio/radio.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
$font-size-height: calc(var(--db-base-font-size) * var(--db-base-line-height));

.db-radio {
@extend %default-color;
@extend %bg-transparent-interactive;

appearance: none;

aspect-ratio: 1;

border: max(calc(#{$font-size-height} / 16 + 0.5px), 2px) solid currentColor;
border: max(calc(#{$font-size-height} / 16 + 0.5px), 2px) solid #{$db-colors-neutral-on-bg};
// Full rounded
border-radius: 100px;

Expand Down Expand Up @@ -47,17 +46,10 @@ $font-size-height: calc(var(--db-base-font-size) * var(--db-base-line-height));
&:is(:user-invalid),
&[aria-invalid="true"] {
@extend %db-bg-critical-transparent-semi;
@extend %db-bg-critical-transparent-semi-hover-state;
border-color: var(
--db-colors-critical-element-enabled,
$db-colors-critical-element-enabled
);
border-color: $db-colors-critical-border-weak;

& + label {
color: var(
--db-colors-critical-enabled,
$db-colors-critical-enabled
);
color: $db-colors-critical;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/styles/_dialog-init.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use "@db-ui/foundations/build/scss/variables" as *;
@use "@db-ui/foundations/build/scss/variables.global" as *;

$backdrop-color: $db-colors-neutral-on-bg-enabled;
$backdrop-color: $db-colors-neutral-on-bg;

%backdrop {
background-color: $backdrop-color;
Expand Down
17 changes: 8 additions & 9 deletions packages/foundations/scripts/color-classes-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ const generateBGVariants = (value, variant) => {
.${prefix}-bg-${value}${nameEnding} {
@extend %${prefix}-bg-${value}${nameEnding};

&-transparent-full {
@extend %${prefix}-bg-${value}${nameEnding}-transparent-full;
}

&-transparent-semi {
@extend %${prefix}-bg-${value}${nameEnding}-transparent-semi;
}

&-ia,
&[data-variant="interactive"] {
@extend %${prefix}-bg-${value}${nameEnding}-ia;
Expand Down Expand Up @@ -52,15 +60,6 @@ exports.generateColorUtilitityClasses = (colorToken) => {
// Default text and background colors (former 'light' tone)
output += generateBGVariants(value);
}

// Transparent tones
const transparentTones = ['full', 'semi'];
for (const transparentTone of transparentTones) {
output += generateBGVariants(
value,
`transparent-${transparentTone}`
);
}
}

return output;
Expand Down
Loading