diff --git a/projects/assets-library/assets/styles/_interaction.scss b/projects/assets-library/assets/styles/_interaction.scss index e96018a25..db75ce1d9 100644 --- a/projects/assets-library/assets/styles/_interaction.scss +++ b/projects/assets-library/assets/styles/_interaction.scss @@ -99,3 +99,18 @@ cursor: not-allowed; } } + +@mixin nav-primary-background { + background: $blue-6; + opacity: 0.95; +} + +@mixin nav-primary-background-hover { + background: $blue-8; + opacity: 0.95; +} + +@mixin nav-secondary-background { + background: $blue-9; + opacity: 0.95; +} diff --git a/projects/components/src/navigation/nav-item/nav-item.component.scss b/projects/components/src/navigation/nav-item/nav-item.component.scss index de4529059..db06ec638 100644 --- a/projects/components/src/navigation/nav-item/nav-item.component.scss +++ b/projects/components/src/navigation/nav-item/nav-item.component.scss @@ -10,10 +10,15 @@ justify-content: flex-start; align-items: center; - border-radius: 4px; + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; padding-left: 16px; padding-right: 16px; + &.collapsed { + border-radius: 0; + } + .label-container { flex-grow: 1; margin-left: 14px; @@ -27,40 +32,37 @@ } .icon { - color: $gray-4; + color: $gray-1; } .label { flex: 1; - @include body-1-medium($gray-6); + @include body-1-medium($gray-2); } &.active { - background-color: $gray-2; + @include nav-primary-background; - .label { - color: $gray-9; + &:hover { + background-color: $blue-5; } - .icon { - color: $gray-6; + .label { + color: white; } - &:hover { - background-color: $gray-1; + .icon { + color: white; } } &:hover { - background-color: $gray-1; + @include nav-primary-background; } .soon-container { flex: 0; - display: flex; - flex-direction: row; - vertical-align: center; - align-items: center; + @include center-contents; } .soon { @@ -71,6 +73,36 @@ font-weight: 600; padding: 2px 4px; } + + &:not(.navigation-dark) { + border-radius: 4px; + .icon { + color: $gray-4; + } + .label { + @include body-1-medium($gray-6); + } + + &:hover { + background-color: $gray-1; + } + + &.active { + background-color: $gray-2; + + .label { + color: $gray-9; + } + + .icon { + color: $gray-6; + } + + &:hover { + background-color: $gray-1; + } + } + } } :hover { diff --git a/projects/components/src/navigation/nav-item/nav-item.component.ts b/projects/components/src/navigation/nav-item/nav-item.component.ts index 47c9c2664..f201a573c 100644 --- a/projects/components/src/navigation/nav-item/nav-item.component.ts +++ b/projects/components/src/navigation/nav-item/nav-item.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { FeatureState, NavigationParams, NavigationParamsType } from '@hypertrace/common'; import { IconSize } from '../../icon/icon-size'; -import { NavItemLinkConfig } from '../navigation.config'; +import { NavItemLinkConfig, NavViewStyle } from '../navigation.config'; @Component({ selector: 'ht-nav-item', @@ -13,7 +13,7 @@ import { NavItemLinkConfig } from '../navigation.config';