Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(card): Do not apply text color to slotted footer items #8839

Merged
merged 5 commits into from
Feb 29, 2024
Merged

fix(card): Do not apply text color to slotted footer items #8839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2363b81
fix(card): Do not apply text color to slotted footer items
macandcheese Feb 27, 2024
d9da5e3
Merge branch 'main' into macandcheese/fix-card-footer-style
macandcheese Feb 28, 2024
9f9c93c
Merge branch 'main' into macandcheese/fix-card-footer-style
macandcheese Feb 28, 2024
28b254a
Merge branch 'main' into macandcheese/fix-card-footer-style
macandcheese Feb 29, 2024
6ce54ca
Merge branch 'main' into macandcheese/fix-card-footer-style
macandcheese Feb 29, 2024
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
2 changes: 0 additions & 2 deletions packages/calcite-components/src/components/card/card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,10 @@
@include slotted("footer-start", "*") {
@apply text-n2-wrap self-center;
margin-inline-end: auto;
color: var(--calcite-color-text-3);
}

@include slotted("footer-end", "*") {
@apply text-n2-wrap self-center;
color: var(--calcite-color-text-3);
}

.checkbox-wrapper-deprecated {
Expand Down
22 changes: 22 additions & 0 deletions packages/calcite-components/src/components/card/card.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,28 @@ export const deprecatedSlotsSelectable_TestOnly = (): string => html`
</calcite-card>
`;

export const slottedFooterItems_TestOnly = (): string => html`
<div id="card-container" style="width:260px;">
<calcite-card>
${thumbnailHtml}
<h3 slot="heading">Portland Businesses</h3>
<span slot="description"
>by
<calcite-link href="">example_user</calcite-link>
</span>
<div>
Created: Apr 22, 2019
<br />
Updated: Dec 9, 2019
<br />
View Count: 0
</div>
<calcite-chip slot="footer-start" value="calcite chip" kind="brand" icon="clock-forward">Recent</calcite-chip>
<calcite-chip slot="footer-end" value="calcite chip" icon="walking">Recreation</calcite-chip>
</calcite-card>
</div>
`;

export const darkModeRTL_TestOnly = (): string => html`
<div dir="rtl" style="width:260px;">
<calcite-card>${thumbnailHtml}${titleHtml}${footerStartTextHtml}${footerEndButtonsHtml}</calcite-card>
Expand Down
Loading