From e4e55073efe0c4323175467a43bf465063559c54 Mon Sep 17 00:00:00 2001 From: Alok Singh Date: Mon, 24 May 2021 15:29:10 +0800 Subject: [PATCH 1/2] fix: changing card hover behaviour --- .../assets-library/assets/styles/_interaction.scss | 4 ++++ .../components/card-list/card-list.component.scss | 13 ++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/projects/assets-library/assets/styles/_interaction.scss b/projects/assets-library/assets/styles/_interaction.scss index 30640fa28..63bf70f91 100644 --- a/projects/assets-library/assets/styles/_interaction.scss +++ b/projects/assets-library/assets/styles/_interaction.scss @@ -15,6 +15,10 @@ } @mixin filter-box-shadow { + @include box-shadow-2dp(); +} + +@mixin box-shadow-2dp { box-shadow: 2px 2px 2px rgba(225, 228, 229, 0.5), 2px -2px 4px rgba(225, 228, 229, 0.2), 0px 2px 4px rgba(225, 228, 229, 0.2); } diff --git a/projects/observability/src/shared/components/card-list/card-list.component.scss b/projects/observability/src/shared/components/card-list/card-list.component.scss index 623fbf0c3..dd83bb747 100644 --- a/projects/observability/src/shared/components/card-list/card-list.component.scss +++ b/projects/observability/src/shared/components/card-list/card-list.component.scss @@ -21,7 +21,10 @@ border-radius: 8px; border: 1px solid $gray-2; margin-bottom: 8px; - @include card-hover; + + &:hover { + @include box-shadow-2dp(); + } &.selected-card { background: $blue-1; @@ -33,9 +36,6 @@ } &:hover { - background: $blue-2; - border: 1px solid $blue-5; - &.grouped-style { margin-bottom: 8px; @include grouped-style($blue-2); @@ -43,11 +43,6 @@ } } - &:hover { - background: $gray-1; - border: 1px solid $gray-2; - } - &.grouped-style { margin-bottom: 8px; @include grouped-style($gray-1); From 83d2b247a9ecaf18cb2880092ba353b56e023c7d Mon Sep 17 00:00:00 2001 From: Alok Singh Date: Mon, 24 May 2021 16:11:02 +0800 Subject: [PATCH 2/2] fix: changing card hover behaviour --- projects/assets-library/assets/styles/_interaction.scss | 2 +- .../src/shared/components/card-list/card-list.component.scss | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/projects/assets-library/assets/styles/_interaction.scss b/projects/assets-library/assets/styles/_interaction.scss index 63bf70f91..fb2586d0b 100644 --- a/projects/assets-library/assets/styles/_interaction.scss +++ b/projects/assets-library/assets/styles/_interaction.scss @@ -9,7 +9,7 @@ @mixin card-hover { &:hover { - @include dropdown-box-shadow(); + @include box-shadow-2dp(); cursor: pointer; } } diff --git a/projects/observability/src/shared/components/card-list/card-list.component.scss b/projects/observability/src/shared/components/card-list/card-list.component.scss index dd83bb747..b039dbc54 100644 --- a/projects/observability/src/shared/components/card-list/card-list.component.scss +++ b/projects/observability/src/shared/components/card-list/card-list.component.scss @@ -22,9 +22,7 @@ border: 1px solid $gray-2; margin-bottom: 8px; - &:hover { - @include box-shadow-2dp(); - } + @include card-hover(); &.selected-card { background: $blue-1;