From 68a65f2ab3b050b9a836cc9f2877d862b3344a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 25 Jun 2014 12:55:49 +0200
Subject: [PATCH] Fixed rows flexbox and margins in taskboard

---
 app/coffee/modules/taskboard.coffee           |  2 +-
 .../views/components/backlog-row.jade         |  3 +-
 .../views/modules/taskboard-table.jade        | 57 +++++--------------
 app/styles/modules/taskboard-table.scss       | 15 ++---
 4 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/app/coffee/modules/taskboard.coffee b/app/coffee/modules/taskboard.coffee
index 323ef024..94055791 100644
--- a/app/coffee/modules/taskboard.coffee
+++ b/app/coffee/modules/taskboard.coffee
@@ -107,9 +107,9 @@ TaskboardDirective = ->
 
 
 TaskboardTaskrowDirective = ->
-    itemSize = 300
     link = ($scope, $el, $attrs) ->
         taiga.bindOnce $scope, "statusList", (statuses) ->
+            itemSize = 300 + (10 * statuses.length)
             size = (1 + statuses.length) * itemSize
             $el.css("width", size + "px")
 
diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade
index 95d49631..be693ba7 100644
--- a/app/partials/views/components/backlog-row.jade
+++ b/app/partials/views/components/backlog-row.jade
@@ -7,8 +7,7 @@ div.row.us-item-row(ng-repeat="us in visibleUserstories track by us.id")
                 a.icon.icon-edit(href="", ng-click="ctrl.editUserStory(us)", title="Edit")
                 a.icon.icon-delete(href="", ng-click="ctrl.deleteUserStory(us)", title="Delete")
         div.user-story-tags
-            span.tag(ng-repeat="tag in us.tags")
-                {{ tag }}
+            span.tag(ng-repeat="tag in us.tags") {{ tag }}
     div.status Status
     div.points 12
     div.points 54
diff --git a/app/partials/views/modules/taskboard-table.jade b/app/partials/views/modules/taskboard-table.jade
index 3efe2349..fb1a46cb 100644
--- a/app/partials/views/modules/taskboard-table.jade
+++ b/app/partials/views/modules/taskboard-table.jade
@@ -11,49 +11,18 @@ div.taskboard-table
                         - for(var y = 0; y < 5; y++)
                             include ../components/tag
                     h3.task-title
-                            span.task-num 125
-                            span Invitacion de los usuarios a la plataforma
-                        ul.task-list
-                            li.task-status Open
-                            li UX
-                                span 4.5
-                            li Diseño
-                                span 4.5
-                            li Front
-                                span 4.5
-                            li Back
-                                span 4.5
-                        include ../components/addnewus
+                        span.task-num 125
+                        span Invitacion de los usuarios a la plataforma
+                    ul.task-list
+                        li.task-status Open
+                        li UX
+                            span 4.5
+                        li Diseño
+                            span 4.5
+                        li Front
+                            span 4.5
+                        li Back
+                            span 4.5
+                    include ../components/addnewus
                 div.taskboard_task-playground.task-column(ng-repeat="s in statusList track by s.id")
                     include ../components/taskboard-task
-
-//
-    div.taskboard-table
-        div.taskboard-table-header
-            div.taskboard-table-inner
-                h2.task-colum_name "User story"
-                h2.task-colum_name(ng-repeat="s in statusList track by s.id", tg-bo-html="s.name")
-        div.taskboard-table-body
-            div.taskboard-table-inner
-                div.taskboard_task-list.task-column
-                    div.task-row(ng-repeat="us in userstories track by us.id")
-                        div.tag-list
-                            - for(var y = 0; y < 5; y++)
-                                include ../components/tag
-                        h3.task-title
-                            span.task-num 125
-                            span Invitacion de los usuarios a la plataforma
-                        ul.task-list
-                            li.task-status Open
-                            li UX
-                                span 4.5
-                            li Diseño
-                                span 4.5
-                            li Front
-                                span 4.5
-                            li Back
-                                span 4.5
-                        include ../components/addnewus
-                div.taskboard_task-playground.task-column(ng-repeat="s in statusList track by s.id")
-                    div.task-row(ng-repeat="us in userstories track by us.id")
-                        include ../components/taskboard-task
diff --git a/app/styles/modules/taskboard-table.scss b/app/styles/modules/taskboard-table.scss
index 304d9fe9..e16ac1cc 100644
--- a/app/styles/modules/taskboard-table.scss
+++ b/app/styles/modules/taskboard-table.scss
@@ -3,7 +3,7 @@
 $column-width: 300px;
 $column-flex: 1;
 $column-shrink: 0;
-$column-margin: 0 .3rem 0 0;
+$column-margin: 0 10px 0 0;
 
 
 .taskboard-table {
@@ -25,6 +25,9 @@ $column-margin: 0 .3rem 0 0;
         margin: $column-margin;
         padding: .5rem 0;
         text-align: center;
+        &:last-child {
+            margin-right: 0;
+        }
     }
 }
 
@@ -33,13 +36,13 @@ $column-margin: 0 .3rem 0 0;
     overflow-x: scroll;
     overflow-y: scroll;
     width: 100%;
-    .taskboard-table-inner {
-        overflow: hidden;
-    }
     .task-column {
         @include table-flex-child($column-flex, $column-width, $column-shrink, $column-width);
         margin: $column-margin;
         padding: 1rem;
+        &:last-child {
+            margin-right: 0;
+        }
     }
     .task-row {
         @include table-flex();
@@ -53,6 +56,7 @@ $column-margin: 0 .3rem 0 0;
 }
 
 .taskboard_task-list {
+    position: relative;
     .tag-list {
         display: none;
         margin-bottom: 1rem;
@@ -76,9 +80,6 @@ $column-margin: 0 .3rem 0 0;
             margin-left: .5rem;
         }
     }
-    .task-row {
-        position: relative;
-    }
     .new-us {
         bottom: 2rem;
         position: absolute;