From 700e0af420b3af0ff0d8d547d16d8d43a6677970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Fri, 25 Jul 2014 12:57:14 +0200 Subject: [PATCH] Fixed Taskboard buttons --- .../views/modules/taskboard-table.jade | 12 ++---- .../modules/backlog/taskboard-table.scss | 38 ++++++++++++------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/app/partials/views/modules/taskboard-table.jade b/app/partials/views/modules/taskboard-table.jade index 97b7c36f..dec7db29 100644 --- a/app/partials/views/modules/taskboard-table.jade +++ b/app/partials/views/modules/taskboard-table.jade @@ -4,8 +4,6 @@ div.taskboard-table h2.task-colum_name "User story" h2.task-colum_name(ng-repeat="s in taskStatusList track by s.id") span(tg-bo-html="s.name") - a.icon.icon-plus(href="", title="Add New task") - a.icon.icon-bulk(href="", title="Add New bulk") div.taskboard-table-body div.taskboard-table-inner(tg-taskboard-row-size-fixer) div.task-row(ng-repeat="us in userstories track by us.id") @@ -15,13 +13,9 @@ div.taskboard-table h3.us-title span.us-ref(tg-bo-ref="us.ref") span(ng-bind="us.subject") - //- TODO Delete all this buttons and logic - div.status(tg-us-status="us", on-update="ctrl.loadSprintState()") - a.us-status(href="", title="Change user story status") - span.us-status-bind - span.icon.icon-arrow-bottom - ul.points-list(tg-taskboard-us-points="us") - //- include ../components/addnewtask + p.points-value + a.icon.icon-plus(href="", title="Add New task") + a.icon.icon-bulk(href="", title="Add New bulk") div.taskboard-tasks-box.task-column(ng-repeat="st in taskStatusList track by st.id", tg-taskboard-sortable) div.taskboard-task(ng-repeat="task in usTasks[us.id][st.id] track by task.id", diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss index 755d7d6d..a9de4907 100644 --- a/app/styles/modules/backlog/taskboard-table.scss +++ b/app/styles/modules/backlog/taskboard-table.scss @@ -33,19 +33,7 @@ $column-margin: 0 10px 0 0; &:last-child { margin-right: 0; } - .icon { - @include transition(color .2s linear); - color: $gray-light; - position: absolute; - right: .5rem; - top: .5rem; - &:hover { - color: $green-taiga; - } - &.icon-plus { - right: 2rem; - } - } + } } @@ -77,6 +65,21 @@ $column-margin: 0 10px 0 0; .taskboard-tasks-box { background: $whitish; } + .taskboard-userstory-box { + .icon { + @include transition(color .2s linear); + color: $gray-light; + position: absolute; + right: .5rem; + top: 1rem; + &:hover { + color: $green-taiga; + } + &.icon-plus { + right: 2rem; + } + } + } } .taskboard-userstory-box { @@ -88,8 +91,14 @@ $column-margin: 0 10px 0 0; .us-title { @extend %large; @extend %title; - margin-bottom: 1rem; + margin-bottom: 0; + margin-right: 3rem; } + .points-value { + @extend %large; + color: $gray-light; + } + /* .us-ref { color: $gray; margin-right: .5rem; @@ -135,6 +144,7 @@ $column-margin: 0 10px 0 0; .button-green { padding: 7px 80px; } + */ } .points-list {