From a14a39e79f302d9bbea66ba35ee15320e6b4bcfb Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 9 Nov 2016 23:38:12 +0100 Subject: [PATCH] Unify tasks list look with other tables --- src/styles/_app_base.sass | 8 ----- src/styles/_tasks.sass | 37 +++++++------------- src/templates/attract/tasks/for_project.jade | 2 +- 3 files changed, 14 insertions(+), 33 deletions(-) diff --git a/src/styles/_app_base.sass b/src/styles/_app_base.sass index 7106428..3dace3c 100644 --- a/src/styles/_app_base.sass +++ b/src/styles/_app_base.sass @@ -90,14 +90,6 @@ body .table-body .table-row - &.active - background-color: $color-background-active - - .table-cell - border-bottom-color: darken($color-background-active, 15%) - .table-cell:last-child - box-shadow: inset -5px 0 0 $color-primary - @include status-color-property(background-color, ' .item-status', '') .table-cell diff --git a/src/styles/_tasks.sass b/src/styles/_tasks.sass index 63c6052..7a3cc6f 100644 --- a/src/styles/_tasks.sass +++ b/src/styles/_tasks.sass @@ -99,46 +99,33 @@ color: $color-primary .status-indicator - background-color: white - height: 16px - width: 16px - min-width: 16px - margin-left: 10px - border-radius: 50% - transition: all 100ms ease-in-out + position: absolute + height: 100% + top: 0 + bottom: 0 + width: 5px .task-list-item + position: relative color: $color-text-dark &:hover - text-decoration: none color: $color-text-dark-primary background-color: $color-background-light - - .status-indicator - transform: scale(1.2) + text-decoration: none &.active 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) - - .status, .type, .due_date + .status, .due_date display: inline-block margin-right: 10px text-transform: uppercase font-size: .8em text-decoration: none - .type - margin-left: auto - color: $color-text-dark-secondary - +text-overflow-ellipsis - .due_date margin-left: auto color: $color-text-dark-primary @@ -147,14 +134,13 @@ &.late color: $color-danger - .name - padding: 10px + padding: 5px 5px 5px 10px +text-overflow-ellipsis .shotname color: $color-text-dark-secondary - margin-left: 10px + margin-left: 15px padding-right: 10px position: relative +text-overflow-ellipsis @@ -169,6 +155,9 @@ content: '' border: thin solid $color-text-dark-hint + .status-indicator+.name + margin-left: 5px + @include status-color-property(background-color, ' .status-indicator', '') option.invalid_task diff --git a/src/templates/attract/tasks/for_project.jade b/src/templates/attract/tasks/for_project.jade index 14715a3..2744423 100644 --- a/src/templates/attract/tasks/for_project.jade +++ b/src/templates/attract/tasks/for_project.jade @@ -10,7 +10,7 @@ | {% if 'PUT' in project.allowed_methods %} a#item-add(href="javascript:task_create(undefined, 'generic');") + Create Task | {% endif %} - .item-list.col-list.col-scrollable + .item-list.task.col-list.col-scrollable | {% for task in tasks %} //- NOTE: this is tightly linked to the JS in tasks.js, function task_add() a.col-list-item.task-list-item(