diff --git a/src/styles/_app_base.sass b/src/styles/_app_base.sass index 922eeb8..4011987 100644 --- a/src/styles/_app_base.sass +++ b/src/styles/_app_base.sass @@ -8,21 +8,15 @@ body &[data-context="task"] nav.sidebar .navbar-item.tasks - background-color: $color-background-nav - box-shadow: inset 3px 0 0 $color-primary - color: white + +sidebar-button-active &[data-context="shot"] nav.sidebar .navbar-item.shots - background-color: $color-background-nav - box-shadow: inset 3px 0 0 $color-primary - color: white + +sidebar-button-active &[data-context="dashboard"] nav.sidebar .navbar-item.attract - background-color: $color-background-nav - box-shadow: inset 3px 0 0 $color-primary - color: white + +sidebar-button-active #app-main display: flex diff --git a/src/styles/_app_utils.sass b/src/styles/_app_utils.sass index d5f1fed..3e4b826 100644 --- a/src/styles/_app_utils.sass +++ b/src/styles/_app_utils.sass @@ -575,3 +575,8 @@ #{$property}: $color-status-review-dark @else #{$property}: $color-status-review + +=sidebar-button-active + background-color: $color-background-nav + box-shadow: inset 2px 0 0 $color-primary + color: white diff --git a/src/styles/_config.sass b/src/styles/_config.sass index 859d060..3a37c9e 100644 --- a/src/styles/_config.sass +++ b/src/styles/_config.sass @@ -6,7 +6,7 @@ $color-background-nav: hsl(hue($color-background), 20%, 25%) $color-background-nav-light: hsl(hue($color-background), 20%, 35%) $color-background-nav-dark: hsl(hue($color-background), 20%, 15%) -$color-background-active: #def4ff // background colour for active items. +$color-background-active: #dff5f6 // background colour for active items. $font-body: 'Roboto' $font-headings: 'Lato' diff --git a/src/styles/_tasks.sass b/src/styles/_tasks.sass index 71aeec0..b21a164 100644 --- a/src/styles/_tasks.sass +++ b/src/styles/_tasks.sass @@ -113,6 +113,7 @@ text-decoration: none background-color: $color-background-active box-shadow: inset -5px 0 0 $color-primary + text-shadow: 1px 1px 0 white .status-indicator transform: scale(1.2) diff --git a/src/templates/attract/tasks/for_project.jade b/src/templates/attract/tasks/for_project.jade index 05fd502..54791da 100644 --- a/src/templates/attract/tasks/for_project.jade +++ b/src/templates/attract/tasks/for_project.jade @@ -20,7 +20,7 @@ href="{{ url_for('attract.tasks.perproject.view_task', project_url=project.url, task_id=task._id) }}") span.status-indicator(title="Status: {{ task.properties.status | undertitle }}") | {% if task._parent_info %} - span.shotname {{ task._parent_info.name }} + span.shotname(title="Shot {{ task._parent_info.name }}") {{ task._parent_info.name }} | {% endif %} span.name {{ task.name }} span.type {{ task.properties.task_type }}