diff --git a/atst/routes/portfolios/__init__.py b/atst/routes/portfolios/__init__.py index 990c7c2e..c35d3899 100644 --- a/atst/routes/portfolios/__init__.py +++ b/atst/routes/portfolios/__init__.py @@ -22,7 +22,6 @@ def portfolio(): portfolio = Portfolios.get( g.current_user, http_request.view_args["portfolio_id"] ) - portfolios = [ws for ws in portfolios if not ws.id == portfolio.id] except UnauthorizedError: pass diff --git a/styles/elements/_sidenav.scss b/styles/elements/_sidenav.scss index e335036c..d06dad8e 100644 --- a/styles/elements/_sidenav.scss +++ b/styles/elements/_sidenav.scss @@ -1,23 +1,39 @@ .sidenav { + width: 25rem; + box-shadow: 0 6px 18px 0 rgba(48,58,65,0.15); + + .sidenav__title { + color: $color-gray-dark; + padding: $gap ($gap * 2); + text-transform: uppercase; + opacity: 0.54; + font-size: $small-font-size; + font-weight: bold; + } + ul { + &.sidenav__list--padded { + margin: 4 * $gap 0; + } + list-style: none; - margin: 0; padding: 0; - li { + li { margin: 0; display: block; } + } .sidenav__link { display: block; - border-top: 1px solid $color-black; padding: $gap ($gap * 2); color: $color-black; text-decoration: none; white-space: nowrap; + .sidenav__link-icon { margin-left: - ($gap * .5); } @@ -27,10 +43,28 @@ pointer-events: none; } + &.sidenav__link--add { + color: $color-blue; + font-size: $small-font-size; + .icon { + @include icon-color($color-blue); + @include icon-size(14); + } + + &:before { + content: ""; + display: block; + width: 4 * $gap; + border: 1px solid #D6D7D9; + margin-left: $gap; + margin-bottom: $gap; + } + } + &.sidenav__link--active { @include h4; color: $color-primary; - background-color: $color-white; + background-color: $color-aqua-lightest; box-shadow: inset ($gap / 2) 0 0 0 $color-primary; .sidenav__link-icon { @@ -89,6 +123,7 @@ &:hover { color: $color-primary; + background-color: $color-aqua-lightest; .sidenav__link-icon { @include icon-style-active; diff --git a/templates/base.html b/templates/base.html index cb97b374..e69dc1dd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -21,6 +21,8 @@ {% include 'navigation/topbar.html' %}
+ {% block global_sidenav %}{% endblock %} +
{% block sidenav %}{% endblock %} diff --git a/templates/portfolios/base.html b/templates/portfolios/base.html index 280e0d0b..2e60ff9b 100644 --- a/templates/portfolios/base.html +++ b/templates/portfolios/base.html @@ -1,5 +1,25 @@ +{% from "components/sidenav_item.html" import SidenavItem %} + {% extends "base.html" %} +{% block global_sidenav %} + +{% endblock %} + {% block content %}