From dd350e67a1b6ab6b86c760172f8583891d6d9db4 Mon Sep 17 00:00:00 2001 From: Andrew Croce Date: Mon, 13 Aug 2018 15:55:31 -0400 Subject: [PATCH] Make side nav sub item dark blue Fix nav behavior on small screens --- styles/elements/_sidenav.scss | 20 +++++++++++++++---- .../navigation/workspace_navigation.html | 5 ----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/styles/elements/_sidenav.scss b/styles/elements/_sidenav.scss index d4c67366..e335036c 100644 --- a/styles/elements/_sidenav.scss +++ b/styles/elements/_sidenav.scss @@ -29,8 +29,8 @@ &.sidenav__link--active { @include h4; - background-color: $color-white; color: $color-primary; + background-color: $color-white; box-shadow: inset ($gap / 2) 0 0 0 $color-primary; .sidenav__link-icon { @@ -38,20 +38,32 @@ } + ul { - background-color: $color-white; + background-color: $color-primary; .sidenav__link { + color: $color-white; + background-color: $color-primary; + + &:hover { + background-color: $color-blue-darker; + } + &--active { @include h5; - color: $color-primary; + color: $color-white; + background-color: $color-primary; box-shadow: none; } + + .icon { + @include icon-color($color-white); + } } } } + ul { - padding-bottom: $gap / 2; + // padding-bottom: $gap / 2; li { .sidenav__link { diff --git a/templates/navigation/workspace_navigation.html b/templates/navigation/workspace_navigation.html index e39ee185..f785c055 100644 --- a/templates/navigation/workspace_navigation.html +++ b/templates/navigation/workspace_navigation.html @@ -26,11 +26,6 @@ "href": "", "active": g.matchesPath('/workspaces/members/new'), "icon": "plus" - }, - { - "label": "Editing Member", - "href": "", - "active": g.matchesPath('/workspaces/123456/members/789/edit') } ] ) }}