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

fix(core/card): card-filled colors for hover/active states #1498

Merged
merged 13 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from 5 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
38 changes: 28 additions & 10 deletions packages/core/src/components/card/card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,24 @@
}
}

:host(.card-insight), :host(.card-outline) {
--ix-card-background: transparent;
@mixin accordionChevronColorPrimary {
::slotted(ix-card-accordion) {
color: var(--theme-color-primary);
}
}

:host(.card-insight),
:host(.card-outline) {
@include accordionChevronColorPrimary;

--ix-card-background: var(--theme-color-ghost);
--ix-card-border-color: var(--theme-color-soft-bdr);
}

:host(.card-notification), :host(.card-filled) {
:host(.card-notification),
:host(.card-filled) {
@include accordionChevronColorPrimary;

--ix-card-background: var(--theme-color-component-1);
}

Expand Down Expand Up @@ -85,17 +97,19 @@
color: var(--theme-color-neutral--contrast);
}

:host(:not(.card-insight)) {
:host(:not(.card-insight, .card-outline)) {
--ix-card-border-color: transparent;
}

// ### Hover ###

:host(.card-insight:hover) {
:host(.card-insight:hover),
:host(.card-outline:hover) {
--ix-card-background: var(--theme-color-ghost--hover);
}

:host(.card-notification:hover) {
:host(.card-notification:hover),
:host(.card-filled:hover) {
--ix-card-background: var(--theme-color-component-1--hover);
}

Expand Down Expand Up @@ -129,11 +143,13 @@

// ### Active ###

:host(.card-insight:active) {
:host(.card-insight:active),
:host( .card-outline:active) {
matthiashader marked this conversation as resolved.
Show resolved Hide resolved
--ix-card-background: var(--theme-color-ghost--active);
}

:host(.card-notification:active) {
:host(.card-notification:active),
:host(.card-filled:active) {
--ix-card-background: var(--theme-color-component-1--active);
}

Expand Down Expand Up @@ -171,11 +187,13 @@
--ix-card-border-color: var(--theme-color-dynamic);
}

:host(.selected.card-insight) {
:host(.selected.card-insight),
:host(.selected.card-outline) {
--ix-card-background: var(--theme-color-ghost--selected);
}

:host(.selected.card-notification) {
:host(.selected.card-notification),
:host(.selected.card-filled) {
--ix-card-background: var(--theme-color-ghost--selected);
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions packages/core/src/tests/action-card/basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@
subheading="Secondary text"
variant="primary"
></ix-action-card>
<ix-action-card
icon="refresh"
heading="Scan for new devices"
subheading="Secondary text"
variant="outline"
></ix-action-card>
<ix-action-card
icon="refresh"
heading="Scan for new devices"
subheading="Secondary text"
variant="filled"
></ix-action-card>
<ix-action-card>
<div class="d-flex flex-column align-items-center" style="color: #ff00ff">
<ix-icon name="refresh"></ix-icon>
Expand Down
14 changes: 14 additions & 0 deletions packages/core/src/tests/action-card/selected/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,20 @@
subheading="Secondary text"
variant="primary"
></ix-action-card>
<ix-action-card
selected
icon="refresh"
heading="Scan for new devices"
subheading="Secondary text"
variant="outline"
></ix-action-card>
<ix-action-card
selected
icon="refresh"
heading="Scan for new devices"
subheading="Secondary text"
variant="filled"
></ix-action-card>
<ix-action-card selected>
<div class="d-flex flex-column align-items-center" style="color: #ff00ff">
<ix-icon name="refresh"></ix-icon>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions packages/core/src/tests/card/basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@
<ix-typography>Primary</ix-typography>
</div>
</ix-card>
<ix-card variant="outline">
<div class="d-flex flex-column align-items-center">
<ix-typography>Outline</ix-typography>
</div>
</ix-card>
<ix-card variant="filled">
<div class="d-flex flex-column align-items-center">
<ix-typography>Filled</ix-typography>
</div>
</ix-card>
<script src="http://127.0.0.1:8080/scripts/e2e/load-e2e-runtime.js"></script>
</body>
</html>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions packages/core/src/tests/card/selected/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@
<ix-typography>Primary</ix-typography>
</div>
</ix-card>
<ix-card selected variant="outline">
<div class="d-flex flex-column align-items-center">
<ix-typography>Outline</ix-typography>
</div>
</ix-card>
<ix-card selected variant="filled">
<div class="d-flex flex-column align-items-center">
<ix-typography>Filled</ix-typography>
</div>
</ix-card>
<script src="http://127.0.0.1:8080/scripts/e2e/load-e2e-runtime.js"></script>
</body>
</html>
18 changes: 18 additions & 0 deletions packages/core/src/tests/push-card/basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,24 @@
>
<ix-topography format="h2">Some Content</ix-topography>
</ix-push-card>
<ix-push-card
icon="bulb"
notification="99"
heading="Heading content"
subheading="Subheading"
variant="outline"
>
<ix-topography format="h2">Some Content</ix-topography>
</ix-push-card>
<ix-push-card
icon="bulb"
notification="99"
heading="Heading content"
subheading="Subheading"
variant="filled"
>
<ix-topography format="h2">Some Content</ix-topography>
</ix-push-card>
</div>
<script src="http://127.0.0.1:8080/scripts/e2e/load-e2e-runtime.js"></script>
</body>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
matthiashader marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading