diff --git a/packages/calcite-components/src/components/button/button.scss b/packages/calcite-components/src/components/button/button.scss index 59fb04da5ff..0c9939090f8 100644 --- a/packages/calcite-components/src/components/button/button.scss +++ b/packages/calcite-components/src/components/button/button.scss @@ -367,7 +367,7 @@ button, a { @apply text-color-1 bg-foreground-1; - border-color: theme("backgroundColor.foreground.3"); + border-color: theme("borderColor.color.1"); &:hover { box-shadow: inset 0 0 0 1px var(--calcite-ui-foreground-3); } diff --git a/packages/calcite-components/src/components/button/button.stories.ts b/packages/calcite-components/src/components/button/button.stories.ts index db7dfa66701..911613a18af 100644 --- a/packages/calcite-components/src/components/button/button.stories.ts +++ b/packages/calcite-components/src/components/button/button.stories.ts @@ -157,5 +157,24 @@ export const darkModeRTL_TestOnly = (): string => html` darkModeRTL_TestOnly.parameters = { modes: modesDarkDefault }; -export const outlineNeutralBorderColor_TestOnly = (): string => - html`Test`; +export const appearanceAndKindCombinations_TestOnly = (): string => html` + outline+brand + outline+danger + outline+inverse + outline+neutral + + outline-fill+brand + outline-fill+danger + outline-fill+inverse + outline-fill+neutral + + solid+brand + solid+danger + solid+inverse + solid+neutral + + transparent+brand + transparent+danger + transparent+inverse + transparent+neutral +`; diff --git a/packages/calcite-components/src/components/split-button/split-button.scss b/packages/calcite-components/src/components/split-button/split-button.scss index e9000a0dfa2..4ae15eae7cf 100644 --- a/packages/calcite-components/src/components/split-button/split-button.scss +++ b/packages/calcite-components/src/components/split-button/split-button.scss @@ -33,12 +33,15 @@ :host([appearance="transparent"]) { &:host([kind="brand"]) { --calcite-split-button-divider: theme("colors.brand"); + --calcite-split-button-background: transparent; } &:host([kind="danger"]) { --calcite-split-button-divider: theme("colors.danger"); + --calcite-split-button-background: transparent; } &:host([kind="neutral"]) { --calcite-split-button-divider: theme("colors.color.1"); + --calcite-split-button-background: transparent; } &:host([kind="inverse"]) { --calcite-split-button-divider: theme("colors.background.foreground.1"); @@ -46,8 +49,7 @@ } } -:host([appearance="outline"]), -:host([appearance="transparent"]) { +:host([appearance="outline"]) { --calcite-split-button-background: transparent; } @@ -64,7 +66,8 @@ --calcite-split-button-divider: theme("colors.danger"); } &:host([kind="neutral"]) { - --calcite-split-button-divider: theme("colors.background.foreground.3"); + --calcite-split-button-divider: theme("borderColor.color.1"); + --calcite-split-button-background: theme("borderColor.color.1"); } &:host([kind="inverse"]) { --calcite-split-button-divider: var(--calcite-ui-inverse); diff --git a/packages/calcite-components/src/components/split-button/split-button.stories.ts b/packages/calcite-components/src/components/split-button/split-button.stories.ts index 96e65629dd3..7b7fab0a5ac 100644 --- a/packages/calcite-components/src/components/split-button/split-button.stories.ts +++ b/packages/calcite-components/src/components/split-button/split-button.stories.ts @@ -120,6 +120,44 @@ export const disabled_TestOnly = (): string => html` `; -export const transparentWithInverseKind_TestOnly = (): string => - html` - `; +export const appearanceAndKindCombinations_TestOnly = (): string => html` + + + + + + + + + + + + + + + + + + + +`;