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): heading/copy spacing #11018

Merged
merged 8 commits into from
Oct 13, 2023
Merged

fix(card): heading/copy spacing #11018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a74def1
fix(card): heading/copy spacing
ariellalgilmore Oct 9, 2023
d05d851
fix(card): format
ariellalgilmore Oct 9, 2023
eab73a2
fix(card): cleanup styles
ariellalgilmore Oct 10, 2023
3ac07f0
fix(card): clean up inverse and static styles
ariellalgilmore Oct 10, 2023
5c76d1b
fix(card): format
ariellalgilmore Oct 10, 2023
3ac2175
fix(card): align to bottom
ariellalgilmore Oct 10, 2023
b907020
Merge branch 'feat/carbon-for-ibm-dotcom-v2' into fix/card-spacing
ariellalgilmore Oct 10, 2023
65384a0
Merge branch 'feat/carbon-for-ibm-dotcom-v2' into fix/card-spacing
ariellalgilmore Oct 12, 2023
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
244 changes: 75 additions & 169 deletions packages/styles/scss/components/card/_card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
@use '../link-with-icon/link-with-icon';

@mixin card {
.#{$prefix}--card,
:host(#{$c4d-prefix}-card),
:host(#{$c4d-prefix}-region-item) .#{$prefix}--link,
:host(#{$c4d-prefix}-card-cta),
Expand All @@ -33,7 +32,6 @@
@include tile($enable-experimental-tile-contrast: true);
}

.#{$prefix}--card,
:host(#{$c4d-prefix}-card),
:host(#{$c4d-prefix}-region-item) .#{$prefix}--link,
:host(#{$c4d-prefix}-link-list-item-card),
Expand All @@ -54,48 +52,6 @@
padding: 0;
transition: $duration-moderate-01 motion(standard, productive);

.#{$prefix}-tile--clickable:hover {
background-color: $layer-hover-01;
text-decoration: none;

.#{$prefix}--card__wrapper {
background-color: $background-hover;
}

&.#{$prefix}--card__CTA--disabled.#{$prefix}--tile--clickable {
background-color: $layer-01;

> * {
background-color: $layer-01;
}
}

::slotted(#{$c4d-prefix}-image),
::slotted(#{$c4d-prefix}-card-cta-image),
.#{$prefix}--card__img,
.#{$prefix}--card__image_img,
.#{$prefix}--image,
.#{$prefix}--card__video-thumbnail {
&::before {
opacity: 0.08;
z-index: 1;
}
}

.#{$prefix}--card__video-thumbnail {
svg {
circle {
opacity: 0.9;
fill: $gray-100;
}

path {
fill: $icon-on-color;
}
}
}
}

&:focus-within {
.#{$prefix}--tile--clickable {
outline: $spacing-01 solid $focus;
Expand Down Expand Up @@ -126,11 +82,7 @@
}

::slotted(#{$c4d-prefix}-image),
::slotted(#{$c4d-prefix}-card-cta-image),
.#{$prefix}--card__img,
.#{$prefix}--card__image_img,
.#{$prefix}--image,
.#{$prefix}--card__video-thumbnail {
::slotted(#{$c4d-prefix}-card-cta-image) {
position: relative;

&::before {
Expand All @@ -146,18 +98,25 @@
}
}

.#{$prefix}--card__video-thumbnail {
svg {
circle,
path {
transition: $duration-moderate-01 motion(standard, productive);
}
}
}

.#{$prefix}--card.#{$prefix}--tile {
&:not([disabled]) .#{$prefix}--card.#{$prefix}--tile {
padding: 0;
transition: $duration-moderate-01 motion(standard, productive);

&:hover {
#{$c4d-prefix}-image,
::slotted(#{$c4d-prefix}-image),
::slotted(#{$c4d-prefix}-card-cta-image) {
&::after {
content: '';
position: absolute;
top: 0;
width: 100%;
height: 100%;
background: $overlay;
opacity: 16%;
}
}
}
}

.#{$prefix}--card__wrapper {
Expand Down Expand Up @@ -229,8 +188,7 @@
}
}

&[pictogram-placement='top'] .#{$prefix}--card,
&[pictogram-placement='bottom'] .#{$prefix}--card {
&[pictogram] .#{$prefix}--card {
::slotted(#{$c4d-prefix}-card-heading) {
padding-top: 0;
}
Expand Down Expand Up @@ -260,34 +218,36 @@
}
}

&[pictogram-placement='top'] .#{$prefix}--card {
::slotted(#{$c4d-prefix}-card-heading) {
align-items: flex-end;
margin-bottom: 0;
margin-top: auto;
}
&[pictogram] {
&[pictogram-placement='top'] .#{$prefix}--card {
::slotted(#{$c4d-prefix}-card-heading) {
align-items: flex-end;
margin-bottom: 0;
margin-top: auto;
}

.#{$prefix}--card__copy {
margin-top: $spacing-07;
}
.#{$prefix}--card__copy {
margin-top: $spacing-07;
}

::slotted(svg[slot='pictogram']) {
margin-bottom: $spacing-07;
::slotted(svg[slot='pictogram']) {
margin-bottom: $spacing-07;
}
}
}

&[pictogram-placement='bottom'] .#{$prefix}--card {
::slotted(#{$c4d-prefix}-card-heading) {
align-items: flex-start;
}
&[pictogram-placement='bottom'] .#{$prefix}--card {
::slotted(#{$c4d-prefix}-card-heading) {
align-items: flex-start;
}

.#{$prefix}--card__copy {
margin-bottom: $spacing-07;
}
.#{$prefix}--card__copy {
margin-bottom: $spacing-07;
}

::slotted(svg[slot='pictogram']) {
margin-top: auto;
align-items: flex-end;
::slotted(svg[slot='pictogram']) {
margin-top: auto;
align-items: flex-end;
}
}
}

Expand Down Expand Up @@ -344,33 +304,29 @@
}

// static card
:host(#{$c4d-prefix}-card) {
// Outlined/Border card
&[border] {
.#{$prefix}--card {
border: 1px solid $layer-accent-01;
}
}
}

:host(#{$c4d-prefix}-card),
:host(#{$c4d-prefix}-card-group-item) {
&:not([href]) {
.cds--card .cds--card__copy {
.#{$prefix}--card .#{$prefix}--card__copy {
margin-bottom: $spacing-01;
}

&,
&:hover {
.#{$prefix}--card__wrapper {
background-color: $layer-01;
.#{$prefix}--card.#{$prefix}--tile ::slotted(#{$c4d-prefix}-image) {
&::after {
display: none;
}
}

&:focus-within ::slotted(#{$c4d-prefix}-image) {
z-index: 0;
}

::slotted(#{$c4d-prefix}-card-heading) {
padding-bottom: $spacing-10;
margin-bottom: auto;
}

::slotted(#{$c4d-prefix}-card-footer) {
margin-top: $spacing-07;
display: inline-flex;
Expand Down Expand Up @@ -465,12 +421,6 @@
color: $text-secondary;
}

:host(#{$c4d-prefix}-card-footer[disabled])
.#{$c4d-prefix}-ce--card__footer
::slotted(svg[slot='icon']) {
color: $text-disabled;
}

:host(#{$c4d-prefix}-card-footer),
:host(#{$c4d-prefix}-card-cta-footer),
:host(#{$c4d-prefix}-card-in-card-footer),
Expand Down Expand Up @@ -547,45 +497,24 @@
}
}

:host(#{$c4d-prefix}-feature-cta-footer) a {
svg,
::slotted(svg[slot='icon']) {
fill: $link-inverse;

@include breakpoint(max) {
width: $spacing-07;
height: $spacing-07;
}
}
}

:host(#{$c4d-prefix}-card-footer),
:host(#{$c4d-prefix}-card-cta-footer) {
.#{$c4d-prefix}-ce--card__footer--static {
color: $link-primary;
}

.#{$prefix}--link-with-icon.#{$prefix}--link-with-icon--inline-icon {
display: flex;
width: 100%;
justify-content: flex-end;
align-items: center;
}

svg {
color: $link-primary;
}

&[color-scheme='inverse'] .#{$c4d-prefix}-ce--card__footer--static {
color: $link-inverse;
&:active {
color: $link-primary-hover;
}
}

&[color-scheme='inverse']
.#{$prefix}--link-with-icon.#{$prefix}--link-with-icon--inline-icon {
svg,
::slotted(svg[slot='icon']) {
color: $link-inverse;
}
.#{$prefix}--link-with-icon.#{$prefix}--link-with-icon--inline-icon:not(
.#{$prefix}--link--disabled
) {
color: $link-inverse;
}
}

Expand Down Expand Up @@ -617,13 +546,24 @@
}
}

.#{$prefix}--card--inverse,
.#{$prefix}--card.#{$prefix}--card--inverse,
:host(#{$c4d-prefix}-card)[color-scheme='inverse'],
:host(#{$c4d-prefix}-card-group-item)[color-scheme='inverse']
:host(#{$c4d-prefix}-card)[color-scheme='inverse']:not([disabled]),
:host(#{$c4d-prefix}-card-group-item)[color-scheme='inverse']:not([disabled])
.#{$prefix}--card {
.#{$prefix}--tile {
background-color: $background-inverse;
border-color: $background-inverse;

&:hover {
#{$c4d-prefix}-image,
::slotted(#{$c4d-prefix}-image),
::slotted(#{$c4d-prefix}-card-cta-image) {
filter: brightness(108%);

&::after {
display: none;
}
}
}
}

.#{$prefix}--card__wrapper:hover {
Expand All @@ -639,18 +579,6 @@
color: $text-placeholder;
}

&:hover {
background-color: $background-inverse-hover;

::slotted(#{$c4d-prefix}-image),
::slotted(#{$c4d-prefix}-card-cta-image),
.#{$prefix}--card__img,
.#{$prefix}--card__image_img,
.#{$prefix}--image {
filter: brightness(108%);
}
}

&:focus-within {
&::after {
content: '';
Expand Down Expand Up @@ -698,34 +626,12 @@

&:hover {
::slotted(#{$c4d-prefix}-image),
::slotted(#{$c4d-prefix}-card-cta-image),
.#{$prefix}--card__img,
.#{$prefix}--card__image_img,
.#{$prefix}--image {
::slotted(#{$c4d-prefix}-card-cta-image) {
filter: brightness(108%);
}
}
}

.#{$prefix}--card--inverse .#{$prefix}--card__cta,
.#{$prefix}--card--inverse .#{$prefix}--card__cta a,
.#{$prefix}--card--inverse .#{$prefix}--card__cta a:visited,
.#{$prefix}--card--inverse
.#{$prefix}--card__footer
.#{$prefix}--card__cta__copy,
:host(#{$c4d-prefix}-card-cta-footer[color-scheme='inverse'])
.#{$c4d-prefix}-ce--card__footer
::slotted(svg[slot='icon']),
:host(#{$c4d-prefix}-card-cta-footer[color-scheme='inverse'])
.#{$prefix}--card__cta__copy,
:host(#{$c4d-prefix}-card-footer[color-scheme='inverse'])
.#{$c4d-prefix}-ce--card__footer
::slotted(svg[slot='icon']),
:host(#{$c4d-prefix}-card-footer[color-scheme='inverse'])
.#{$prefix}--card__cta__copy {
color: $link-inverse;
}

@media print {
:host(#{$c4d-prefix}-card),
:host(#{$c4d-prefix}-link-list-item-card),
Expand Down
Loading
Loading