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.

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

feat(design): update linked card background color to animate via opacity #2584

Merged
merged 1 commit into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,15 @@

@mixin daff-linkable-card-theme-variant(
$hover-color,
$active-color,
$shadow-color
) {
&:hover,
&:focus {
background: $hover-color;
color: theming.daff-text-contrast($hover-color);
.daff-card__wrapper {
&:after {
background: $hover-color;
}
}

&:hover,
&:focus {
outline: none;
box-shadow: 0 0 0 4px rgba($shadow-color, 0.3);
}

&:active {
background: $active-color;
color: theming.daff-text-contrast($active-color);
color: theming.daff-text-contrast($hover-color);
}
}
42 changes: 13 additions & 29 deletions libs/design/src/molecules/card/card/card-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,74 +112,58 @@
a {
&.daff-card {
@include linkable.daff-linkable-card-theme-variant(
theming.daff-illuminate($base, $gray, 2),
theming.daff-illuminate($base, $gray, 3),
theming.daff-color($gray)
theming.daff-illuminate($base, $gray, 2)
);

&.daff-primary {
@include linkable.daff-linkable-card-theme-variant(
theming.daff-color($primary, 70),
theming.daff-color($primary, 80),
theming.daff-color($primary)
theming.daff-color($primary, 70)
);
}

&.daff-secondary {
@include linkable.daff-linkable-card-theme-variant(
theming.daff-color($secondary, 70),
theming.daff-color($secondary, 80),
theming.daff-color($secondary)
theming.daff-color($secondary, 70)
);
}

&.daff-tertiary {
@include linkable.daff-linkable-card-theme-variant(
theming.daff-color($tertiary, 70),
theming.daff-color($tertiary, 80),
theming.daff-color($tertiary)
theming.daff-color($tertiary, 70)
);
}

&.daff-theme {
@include linkable.daff-linkable-card-theme-variant(
theming.daff-illuminate($base, $gray, 1),
theming.daff-illuminate($base, $gray, 2),
theming.daff-color($gray)
theming.daff-illuminate($base, $gray, 1)
);
}

&.daff-theme-contrast {
@include linkable.daff-linkable-card-theme-variant(
theming.daff-illuminate($base-contrast, $gray, 1),
theming.daff-illuminate($base-contrast, $gray, 2),
theming.daff-color($gray)
theming.daff-illuminate($base-contrast, $gray, 1)
);
}

&.daff-black {
@include linkable.daff-linkable-card-theme-variant(
theming.daff-color($gray, 100),
theming.daff-color($gray, 90),
theming.daff-color($gray)
theming.daff-color($gray, 100)
);
}

&.daff-white {
@include linkable.daff-linkable-card-theme-variant(
theming.daff-color($gray, 10),
theming.daff-color($gray, 20),
theming.daff-color($gray)
theming.daff-color($gray, 10)
);
}
}

&.daff-raised-card {
&:hover,
&:focus,
&:active {
box-shadow: 0 16px 32px -4px rgba($black, 0.12),
0 8px 12px -2px rgba($black, 0.06);
.daff-card__wrapper {
&:after {
box-shadow: 0 16px 32px -4px rgba($black, 0.12),
0 8px 12px -2px rgba($black, 0.06);
}
}
}
}
Expand Down
33 changes: 32 additions & 1 deletion libs/design/src/molecules/card/card/card.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ $card-img-border-radius: calc(#{$card-border-radius} - 1px);
$root: &;
display: flex;
border-radius: $card-border-radius;
position: relative;

&__image {
display: inline-block;
Expand Down Expand Up @@ -76,6 +77,8 @@ $card-img-border-radius: calc(#{$card-border-radius} - 1px);

&__body {
padding: 1.5rem;
position: relative;
z-index: 2;
}

&__content {
Expand All @@ -99,7 +102,35 @@ a {
&.daff-card,
&.daff-raised-card,
&.daff-stroked-card {
$root: &;
text-decoration: none;
transition: background-color 300ms, box-shadow 300ms;

.daff-card__wrapper {
position: relative;

&:after {
content: '';
position: absolute;
border-bottom-left-radius: $card-img-border-radius;
border-bottom-right-radius: $card-img-border-radius;
left: 0;
top: 0;
height: 100%;
width: 100%;
opacity: 0;
transition: opacity 300ms;
z-index: 1;
}
}

&:hover,
&:focus,
&:active {
.daff-card__wrapper {
&:after {
opacity: 1;
}
}
}
}
}