From fee9c1b9b5a305c1f691ca5a1cc379ab2c4b7df8 Mon Sep 17 00:00:00 2001 From: Cory Rylan Date: Tue, 8 Mar 2022 12:58:46 -0600 Subject: [PATCH] fix(core): contrast colors - fix shim alignment colors with button/card for clr-angular compat Signed-off-by: Cory Rylan --- packages/core/src/button/button.element.scss | 3 ++- packages/core/src/card/card.element.scss | 4 ++++ packages/core/src/styles/theme.dark.scss | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/core/src/button/button.element.scss b/packages/core/src/button/button.element.scss index ad09570c3..bc25ad7dd 100644 --- a/packages/core/src/button/button.element.scss +++ b/packages/core/src/button/button.element.scss @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2021 VMware, Inc. All Rights Reserved. +// Copyright (c) 2016-2022 VMware, Inc. All Rights Reserved. // This software is released under MIT license. // The full license information can be found in LICENSE in the root directory of this project. @@ -221,6 +221,7 @@ cds-progress-circle { :host([disabled]), :host([disabled][action='outline']) { --background: #{$cds-alias-status-disabled-tint}; + --color: #{$cds-alias-status-disabled-shade}; --border-color: #{$cds-alias-status-disabled-tint}; --box-shadow-color: #{$cds-alias-object-opacity-0}; diff --git a/packages/core/src/card/card.element.scss b/packages/core/src/card/card.element.scss index ec038865b..4ea1158a9 100644 --- a/packages/core/src/card/card.element.scss +++ b/packages/core/src/card/card.element.scss @@ -10,3 +10,7 @@ --card-remove-margin: var(--cds-global-space-8); } + +::slotted([cds-card-remove-margin]) { + --color: #{$cds-alias-object-container-border-color}; +} diff --git a/packages/core/src/styles/theme.dark.scss b/packages/core/src/styles/theme.dark.scss index cb959a4f7..93fa4516c 100644 --- a/packages/core/src/styles/theme.dark.scss +++ b/packages/core/src/styles/theme.dark.scss @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2021 VMware, Inc. All Rights Reserved. +// Copyright (c) 2016-2022 VMware, Inc. All Rights Reserved. // This software is released under MIT license. // The full license information can be found in LICENSE in the root directory of this project. @@ -59,5 +59,5 @@ --cds-alias-status-neutral-shade: #{$cds-global-color-construction-500}; --cds-alias-status-disabled: #{$cds-global-color-construction-600}; --cds-alias-status-disabled-tint: #{$cds-global-color-construction-700}; - --cds-alias-status-disabled-shade: #{$cds-global-color-construction-800}; + --cds-alias-status-disabled-shade: #{$cds-global-color-construction-900}; }