Merge remote-tracking branch 'origin/master' into scssLint

Conflicts:
	app/styles/layout/backlog.scss

app/styles/layout/backlog.scss

@@ -1,3 +1,9 @@
+.backlog {
+    .new-us {
+        float: right;
+    }
+}
+
 .backlog-menu {
     @include clearfix;
     background: $whitish;
@@ -10,7 +16,3 @@
         padding: 4px 0;
     }
 }
-
-.new-us {
-    float: right;
-}

app/styles/layout/taskboard.scss

@@ -0,0 +1,5 @@
+.taskboard {
+    .burndown-container {
+        display: none;
+    }
+}

app/styles/main.scss

@@ -27,6 +27,7 @@ $prefix-for-spec:      true;
 //Layout
 @import 'layout/base';
 @import 'layout/backlog';
+@import 'layout/taskboard';
 
 //Modules
 @import 'modules/nav';
@@ -36,6 +37,7 @@ $prefix-for-spec:      true;
 @import 'modules/backlog-table';
 @import 'modules/filters';
 @import 'modules/lightbox';
+@import 'modules/taskboard-table';
 
 // Responsive
 @import 'responsive/mobile';

app/styles/modules/sprints.scss

@@ -138,7 +138,7 @@
         .icon {
             @include transform(rotate(180deg));
             &:hover {
-                @include transform(rotate(0deg));
+                @include transform(rotate(0));
                 @include transition (all .2s ease-in);
             }
         }
@@ -154,7 +154,7 @@
         .icon {
             @include transform(rotate(180deg));
             &:hover {
-                @include transform(rotate(0deg));
+                @include transform(rotate(0));
                 @include transition (all .2s ease-in);
             }
         }

app/styles/modules/taskboard-table.scss

@@ -0,0 +1,100 @@
+%table-flex {
+    align-content: stretch;
+    align-items: stretch;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+}
+
+%table-flex-child {
+    flex-basis: 300px;
+    flex-grow: 1;
+    flex-shrink: 0;
+    width: 300px;
+}
+
+.taskboard-table {
+    overflow: hidden;
+    width: 100%;
+}
+
+.taskboard-table-header {
+    margin-bottom: .5rem;
+    width: 100%;
+    .taskboard-table-inner {
+        @extend %table-flex;
+        overflow: hidden;
+        width: 3500px; //Just and example, should be JS calc
+    }
+    .task-colum_name {
+        @extend %table-flex-child;
+        @extend %large;
+        background: $whitish;
+        margin: 0 .3rem;
+        padding: .5rem 0;
+        text-align: center;
+    }
+}
+
+.taskboard-table-body {
+    height: 700px;
+    overflow-x: scroll;
+    overflow-y: scroll;
+    width: 100%;
+    .taskboard-table-inner {
+        @extend %table-flex;
+        overflow: hidden;
+        width: 3500px; //Just and example, should be JS calc
+    }
+    .task-column {
+        @extend %table-flex-child;
+    }
+    .task-row {
+        height: 30rem;
+        margin: 0 .3rem 1rem;
+        margin-bottom: 1rem;
+        padding: 1rem;
+    }
+    .taskboard_task-playground {
+        .task-row {
+            background: $whitish;
+        }
+    }
+}
+
+.taskboard_task-list {
+    .tag-list {
+        display: none;
+        margin-bottom: 1rem;
+    }
+    .task-title {
+        @extend %large;
+        font-family: 'DroidSans';
+        margin-bottom: 1rem;
+    }
+    .task-num {
+        color: $gray;
+        margin-right: .5rem;
+    }
+    .task-status {
+        color: $green-taiga;
+        margin-bottom: .5rem;
+    }
+    .task-list {
+        span {
+            color: $gray;
+            margin-left: .5rem;
+        }
+    }
+    .task-row {
+        position: relative;
+    }
+    .new-us {
+        bottom: 2rem;
+        position: absolute;
+    }
+    .button-green {
+        padding: 7px 80px;
+    }
+}

app/taskboard.jade

@@ -4,9 +4,11 @@ block head
     title Taiga  Project management web application with scrum in mind!
 
 block content
-    section.main.usstory
+    section.main.taskboard
         h1
             span ProjectName
             span.green Sprint Name
             span.date 02/10/2014-15/10/2014
         include views/components/large-summary
+        include views/modules/burndown
+        include views/modules/taskboard-table

app/usstory-detail.jade

@@ -1,12 +0,0 @@
-extends layout
-
-block head
-    title Taiga  Project management web application with scrum in mind!
-
-block content
-    section.main.usstory
-        include views/components/mainTitle
-
-    sidebar.menu-secondary.sidebar
-
-

app/views/modules/taskboard-table.jade

@@ -0,0 +1,32 @@
+div.taskboard-table
+    div.taskboard-table-header
+        div.taskboard-table-inner
+            - for(var z = 0; z < 11; z++)
+                h2.task-colum_name user stories
+    div.taskboard-table-body
+        div.taskboard-table-inner
+            div.taskboard_task-list.task-column
+                - for(var x = 0; x < 3; x++)
+                    div.task-row
+                        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
+            - for(var z = 0; z < 10; z++)
+                div.taskboard_task-playground.task-column
+                    - for(var x = 0; x < 3; x++)
+                        div.task-row
+                            //- Include tasks