From da16b1eac0cbdc77292e9050899d1dea9adfe092 Mon Sep 17 00:00:00 2001 From: ChitlangeSahas Date: Fri, 4 Nov 2022 12:01:27 -0700 Subject: [PATCH 1/2] feat(TreeNav): Clockface 4 updates --- src/Components/TreeNav/TreeNav.scss | 47 ++++++++++------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/src/Components/TreeNav/TreeNav.scss b/src/Components/TreeNav/TreeNav.scss index 4bc899d06..b27d40ad9 100644 --- a/src/Components/TreeNav/TreeNav.scss +++ b/src/Components/TreeNav/TreeNav.scss @@ -8,13 +8,7 @@ .cf-tree-nav { width: 100%; user-select: none; - background-image: linear-gradient( - 13.54deg, - rgba($c-pool, 0.1) 36.27%, - rgba($c-pool, 0.25) 78.76%, - rgba($c-pool, 0.15) 100% - ); - background-color: $cf-grey-5; + background-color: $cf-grey-1; a, a:link, @@ -44,13 +38,7 @@ $cf-tree-nav__header-height: 60px; display: flex; flex-direction: column; align-items: stretch; - background-image: linear-gradient( - 13.54deg, - rgba($c-pool, 0.1) 36.27%, - rgba($c-pool, 0.25) 78.76%, - rgba($c-pool, 0.15) 100% - ); - background-color: $cf-grey-5; + background-color: $cf-grey-1; padding: $cf-space-xs $cf-space-2xs; } @@ -203,7 +191,7 @@ a.cf-tree-nav--header:active { .cf-tree-nav--header { color: $cf-white; - background: rgba($cf-grey-95, 0.05); + background: $cf-grey-2; &:after { @include createOverlayBase(); @@ -239,16 +227,19 @@ a.cf-tree-nav--header:active { outline: none; } - &:after { - @include createOverlayBase(); - background: linear-gradient(0deg, rgba($c-pool, 0.05), rgba($c-pool, 0.05)), - rgba($cf-grey-95, 0.05); + &.cf-tree-nav--item__active { + background-color: $cf-dark-lavender; + + .cf-tree-nav--label , .cf-tree-nav--square{ + color: $cf-lavender; + } + .cf-tree-nav--sub-menu{ + background-color: $cf-grey-2; + } } - .cf-tree-nav:not(.cf-tree-nav__collapsed) &.cf-tree-nav--item__active:after, - &:hover:after, - &:focus-within:after { - opacity: 1; + &:hover:not(.cf-tree-nav--item__active){ + background-color: $cf-grey-3; } } @@ -363,7 +354,7 @@ a.cf-tree-nav--item-block:active { &.cf-tree-nav--sub-item__active, &:not(.cf-tree-nav--sub-heading):hover { - background: rgba($cf-grey-95, $cf-hover-active-opacity); + background: rgba($cf-grey-4, 0.5); border-radius: $cf-radius; cursor: pointer; } @@ -583,13 +574,7 @@ a.cf-tree-nav--user-item:hover { position: relative; transition: flex-basis $cf-transition-default; z-index: $cf-z--nav-menu; - background-image: linear-gradient( - 13.54deg, - rgba($c-pool, 0.1) 36.27%, - rgba($c-pool, 0.25) 78.76%, - rgba($c-pool, 0.15) 100% - ); - background-color: $cf-grey-5; + background-color: $cf-grey-1; } .cf-tree-nav--menu, From 3fffab7df86d83d8e33237e038552580012cd9d1 Mon Sep 17 00:00:00 2001 From: ChitlangeSahas Date: Fri, 4 Nov 2022 12:16:23 -0700 Subject: [PATCH 2/2] chore: prettier --- src/Components/TreeNav/TreeNav.scss | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Components/TreeNav/TreeNav.scss b/src/Components/TreeNav/TreeNav.scss index b27d40ad9..c1693ec92 100644 --- a/src/Components/TreeNav/TreeNav.scss +++ b/src/Components/TreeNav/TreeNav.scss @@ -230,15 +230,16 @@ a.cf-tree-nav--header:active { &.cf-tree-nav--item__active { background-color: $cf-dark-lavender; - .cf-tree-nav--label , .cf-tree-nav--square{ - color: $cf-lavender; - } - .cf-tree-nav--sub-menu{ + .cf-tree-nav--label, + .cf-tree-nav--square { + color: $cf-lavender; + } + .cf-tree-nav--sub-menu { background-color: $cf-grey-2; } } - &:hover:not(.cf-tree-nav--item__active){ + &:hover:not(.cf-tree-nav--item__active) { background-color: $cf-grey-3; } }