Skip to content

Commit

Permalink
Fix tertiary card disabled styles
Browse files Browse the repository at this point in the history
  • Loading branch information
joshwooding committed Jan 28, 2025
1 parent 3e474a0 commit d2a6f7a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .changeset/lovely-bats-kick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@salt-ds/core": patch
---

Fixed secondary and tertiary InteractableCards having incorrect disabled styling.
10 changes: 9 additions & 1 deletion packages/core/src/interactable-card/InteractableCard.css
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,18 @@
.saltInteractableCard-secondary.saltInteractableCard-disabled,
.saltInteractableCard-secondary.saltInteractableCard-disabled:focus,
.saltInteractableCard-secondary.saltInteractableCard-disabled:active {
background: var(--saltInteractableCard-background-disabled, var(--salt-container-secondary-background));
background: var(--saltInteractableCard-background-disabled, var(--salt-container-secondary-background-disabled));
border-color: var(--salt-container-secondary-borderColor-disabled);
}

/* Styles applied to InteractableCard tertiary variant if `disabled={true}` */
.saltInteractableCard-tertiary.saltInteractableCard-disabled,
.saltInteractableCard-tertiary.saltInteractableCard-disabled:focus,
.saltInteractableCard-tertiary.saltInteractableCard-disabled:active {
background: var(--salt-container-tertiary-background-disabled);
border-color: var(--salt-container-tertiary-borderColor-disabled);
}

/* Styles applied to InteractableCard if `selected={true}`and `disabled={true}` */
.saltInteractableCard-selected.saltInteractableCard-disabled,
.saltInteractableCard-selected.saltInteractableCard-disabled:focus,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@ export const AllExamples: StoryFn<QAContainerProps & { className?: string }> = (
<Text>Content</Text>
</InteractableCard>
</InteractableCardGroup>
<InteractableCard disabled>
<H1>Disabled primary</H1>
<Text>Content</Text>
</InteractableCard>
<InteractableCard disabled variant="secondary">
<H1>Disabled secondary</H1>
<Text>Content</Text>
</InteractableCard>
<InteractableCard disabled variant="tertiary">
<H1>Disabled tertiary</H1>
<Text>Content</Text>
</InteractableCard>
</QAContainer>
);
};
Expand Down Expand Up @@ -117,6 +129,18 @@ export const NoStyleInjectionGrid: StoryFn<QAContainerNoStyleInjectionProps> = (
<Text>Content</Text>
</InteractableCard>
</InteractableCardGroup>
<InteractableCard disabled>
<H1>Disabled primary</H1>
<Text>Content</Text>
</InteractableCard>
<InteractableCard disabled variant="secondary">
<H1>Disabled secondary</H1>
<Text>Content</Text>
</InteractableCard>
<InteractableCard disabled variant="tertiary">
<H1>Disabled tertiary</H1>
<Text>Content</Text>
</InteractableCard>
</QAContainerNoStyleInjection>
);

Expand Down

0 comments on commit d2a6f7a

Please sign in to comment.