diff --git a/.changeset/brave-jeans-rule.md b/.changeset/brave-jeans-rule.md new file mode 100644 index 00000000000..18e697f561f --- /dev/null +++ b/.changeset/brave-jeans-rule.md @@ -0,0 +1,5 @@ +--- +"@siemens/ix": patch +--- + +Color **ix-blind** borders according to variant. diff --git a/.changeset/brave-jeans-rulez.md b/.changeset/brave-jeans-rulez.md new file mode 100644 index 00000000000..cfb2a6014c9 --- /dev/null +++ b/.changeset/brave-jeans-rulez.md @@ -0,0 +1,5 @@ +--- +"@siemens/ix": patch +--- + +Color **ix-push-card** borders according to variant. diff --git a/packages/core/src/components/blind/blind.scss b/packages/core/src/components/blind/blind.scss index 64e9c51d43d..7dfbe807cd2 100644 --- a/packages/core/src/components/blind/blind.scss +++ b/packages/core/src/components/blind/blind.scss @@ -7,20 +7,26 @@ * LICENSE file in the root directory of this source tree. */ +@use 'sass:list'; +@use 'sass:map'; @use 'misc/common-variables' as vars; @use 'legacy/mixins/fonts'; @use 'mixins/hover'; @use 'mixins/text-truncation'; @use 'mixins/shadow-dom/component'; +$blind-status-border: ( + alarm: var(--theme-color-alarm-bdr), + critical: var(--theme-color-critical), + warning: var(--theme-color-warning-bdr), + info: var(--theme-color-info), + success: var(--theme-color-success), + neutral: var(--theme-color-neutral), + primary: var(--theme-color-primary), +); + @mixin blind($variant: 'filled') { :host(.blind-#{$variant}) { - @if $variant == 'outline' { - border: solid - var(--theme-blind--border-thickness) - var(--theme-blind-base--border-color); - } - .blind-header { @if $variant == 'outline' { background-color: var(--theme-color-ghost); @@ -65,11 +71,61 @@ } @if $variant == 'outline' { - border-color: var(--theme-color-soft-bdr); - } @else { + .blind-header-wrapper { + border: solid + var(--theme-blind--border-thickness) + var(--theme-color-soft-bdr); + border-bottom: none; + border-radius: var(--theme-blind--border-radius) + var(--theme-blind--border-radius) + 0 + 0; + + @include hover.hover { + border-color: var(--theme-color-ghost--hover); + } + + @include hover.active { + border-color: var(--theme-color-ghost--active); + } + } + + .blind-header { + border-radius: 0; + } + } + + @if $variant != 'filled' { + .blind-content { + border-radius: 0 + 0 + var(--theme-blind--border-radius) + var(--theme-blind--border-radius); + + @if $variant == 'outline' { + border: solid + var(--theme-blind--border-thickness) + var(--theme-color-soft-bdr); + border-top: none; + } @else { + border: solid + var(--theme-blind--border-thickness) + #{map.get($blind-status-border, $variant)}; + border-top: none; + } + } + } + + @if $variant != 'outline' { background-color: var(--theme-blind-base--background); } } + + @if not list.index(('filled', 'outline'), $variant) { + :host(.blind-#{$variant}[collapsed]) .blind-content { + border-width: 0; + } + } } :host { @@ -196,6 +252,7 @@ max-height: 0; padding-top: 0px; padding-bottom: 0px; + border-width: 0; } } @@ -220,3 +277,24 @@ $blind-variants: ( @each $variant in $blind-variants { @include blind($variant); } + +:host(.blind-outline[collapsed]) { + .blind-header-wrapper { + box-sizing: border-box; + border-bottom: solid var(--theme-blind--border-thickness) + var(--theme-color-soft-bdr); + border-radius: var(--theme-blind--border-radius); + + @include hover.hover { + border-color: var(--theme-color-ghost--hover); + } + + @include hover.active { + border-color: var(--theme-color-ghost--active); + } + } + + .blind-content { + border-width: 0; + } +} diff --git a/packages/core/src/components/card-accordion/card-accordion.scss b/packages/core/src/components/card-accordion/card-accordion.scss index c064505c7b4..5bb8be559e7 100644 --- a/packages/core/src/components/card-accordion/card-accordion.scss +++ b/packages/core/src/components/card-accordion/card-accordion.scss @@ -16,6 +16,7 @@ flex-direction: column; width: 100%; transition: var(--theme-default-time) ease-in-out; + --ix-card-accordion-expanded-height: 14.75rem; @include component.ix-component; @@ -57,18 +58,25 @@ } .expand-content { - display: grid; + display: block; position: relative; - grid-template-rows: 0fr; - transition: var(--theme-default-time) ease-in-out; width: 100%; - max-height: 14.75rem; - opacity: 0; + height: 0; + overflow: hidden; + transition: height var(--theme-default-time) ease-in-out; + } + + .expand-content::after { + content: ''; + position: absolute; + inset: 0; + pointer-events: none; + border-radius: var(--ix-card-accordion-expand-content--border-radius, 0); + border-top: none; } .expand-content.show { - grid-template-rows: 14.75rem; - opacity: 1; + height: var(--ix-card-accordion-expanded-height); } .expand-content-inner { @@ -77,27 +85,27 @@ overflow: hidden; } - .expand-content.show .expand-content-body { - display: none; - overflow: hidden; - color: var(--theme-color-std-text); + .expand-content-body { + opacity: 0; + transition: opacity var(--theme-default-time) ease-in-out; } .expand-content.show .expand-content-body { display: block; overflow: auto; - height: calc(100% - 1rem); + height: calc(var(--ix-card-accordion-expanded-height) - 1rem); + color: var(--theme-color-std-text); + opacity: 1; } .expand-content-footer { display: block; - position: relative; + position: absolute; + bottom: 0; + left: 0; width: 100%; height: 1rem; - margin-top: auto; - margin-bottom: 0px; - background-color: var(--theme-color-component-1); border-bottom-left-radius: var(--theme-default-border-radius); border-bottom-right-radius: var(--theme-default-border-radius); @@ -130,13 +138,13 @@ ); } - .expand-content.show { - border: var( - --theme-push-card-#{$variant}-accordion-frame--border-width, - 0px - ) + .expand-content::after { + border: var(--theme-push-card-#{$variant}-accordion-frame--border-width) solid - var(--theme-push-card-#{$variant}-accordion-frame--border-color); + transparent; + border-color: var( + --theme-push-card-#{$variant}-accordion-frame--border-color + ); } .expand-content.show .expand-content-body { diff --git a/packages/core/src/components/push-card/push-card.scss b/packages/core/src/components/push-card/push-card.scss index fb9414940fe..3d02410cce1 100644 --- a/packages/core/src/components/push-card/push-card.scss +++ b/packages/core/src/components/push-card/push-card.scss @@ -41,5 +41,35 @@ solid var(--theme-push-card-#{$variant}-accordion--border-color); } + + ix-card-accordion { + --theme-push-card-#{$variant}-accordion--background--hover: var(--theme-push-card-#{$variant}-accordion--background); + --theme-push-card-#{$variant}-accordion--background--active: var(--theme-push-card-#{$variant}-accordion--background); + --theme-push-card-#{$variant}-accordion-frame--border-color: var(--theme-push-card-#{$variant}-accordion--background); + --ix-card-accordion-expand-content--border-radius: 0 0 var(--theme-default-border-radius) var(--theme-default-border-radius); + + @if $variant != 'outline' and $variant != 'filled' { + --ix-card-accordion-expand-content--border-radius: 0 0 calc(var(--theme-default-border-radius) + var(--theme-push-card--border-width)) calc(var(--theme-default-border-radius) + var(--theme-push-card--border-width)); + } + + @if $variant == 'outline' or $variant == 'filled' { + --ix-card-background: var(--theme-color-component-1); + } + + @if $variant == 'outline' { + --theme-push-card-outline-accordion-frame--border-color: var(--theme-color-soft-bdr); + } + } + + @if $variant == 'outline' { + ix-card { + --ix-card-border-color: var(--theme-color-soft-bdr); + + &:hover, + &:active { + --ix-card-border-color: var(--theme-color-soft-bdr); + } + } + } } } diff --git a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-basic-1-chromium---classic-dark-linux.png b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-basic-1-chromium---classic-dark-linux.png index 53ced302597..8df1bf03b56 100644 Binary files a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-basic-1-chromium---classic-dark-linux.png and b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-basic-1-chromium---classic-dark-linux.png differ diff --git a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-basic-1-chromium---classic-light-linux.png b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-basic-1-chromium---classic-light-linux.png index 58762fe6d44..3f2a765acc4 100644 Binary files a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-basic-1-chromium---classic-light-linux.png and b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-basic-1-chromium---classic-light-linux.png differ diff --git a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-collapsed-1-chromium---classic-dark-linux.png b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-collapsed-1-chromium---classic-dark-linux.png index 282a088b554..a61909b850a 100644 Binary files a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-collapsed-1-chromium---classic-dark-linux.png and b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-collapsed-1-chromium---classic-dark-linux.png differ diff --git a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-collapsed-1-chromium---classic-light-linux.png b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-collapsed-1-chromium---classic-light-linux.png index 240ae15843b..6b831763ac9 100644 Binary files a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-collapsed-1-chromium---classic-light-linux.png and b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-collapsed-1-chromium---classic-light-linux.png differ diff --git a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-custom-header-1-chromium---classic-dark-linux.png b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-custom-header-1-chromium---classic-dark-linux.png index 7f162e5f635..3428e2f95e3 100644 Binary files a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-custom-header-1-chromium---classic-dark-linux.png and b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-custom-header-1-chromium---classic-dark-linux.png differ diff --git a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-custom-header-1-chromium---classic-light-linux.png b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-custom-header-1-chromium---classic-light-linux.png index f6c8339dff7..9882753c77c 100644 Binary files a/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-custom-header-1-chromium---classic-light-linux.png and b/testing/visual-testing/__screenshots__/tests/blind/blind.e2e.ts/blind-custom-header-1-chromium---classic-light-linux.png differ diff --git a/testing/visual-testing/__screenshots__/tests/push-card/push-card.e2e.ts/push-card-basic-should-click-accordion-1-chromium---classic-dark-linux.png b/testing/visual-testing/__screenshots__/tests/push-card/push-card.e2e.ts/push-card-basic-should-click-accordion-1-chromium---classic-dark-linux.png index 588d1a9c2dd..054f94b197a 100644 Binary files a/testing/visual-testing/__screenshots__/tests/push-card/push-card.e2e.ts/push-card-basic-should-click-accordion-1-chromium---classic-dark-linux.png and b/testing/visual-testing/__screenshots__/tests/push-card/push-card.e2e.ts/push-card-basic-should-click-accordion-1-chromium---classic-dark-linux.png differ diff --git a/testing/visual-testing/__screenshots__/tests/push-card/push-card.e2e.ts/push-card-basic-should-click-accordion-1-chromium---classic-light-linux.png b/testing/visual-testing/__screenshots__/tests/push-card/push-card.e2e.ts/push-card-basic-should-click-accordion-1-chromium---classic-light-linux.png index 8034805d805..98e31c6a4c1 100644 Binary files a/testing/visual-testing/__screenshots__/tests/push-card/push-card.e2e.ts/push-card-basic-should-click-accordion-1-chromium---classic-light-linux.png and b/testing/visual-testing/__screenshots__/tests/push-card/push-card.e2e.ts/push-card-basic-should-click-accordion-1-chromium---classic-light-linux.png differ