From a13501cc58d2547b5c660d5cc9484eecd8e73a75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Thu, 27 Nov 2014 15:30:39 +0100
Subject: [PATCH] Fix table columns layout in team members

---
 .../views/modules/team/team-table.jade        | 49 ++++++++++---------
 app/styles/dependencies/colors.scss           |  2 +-
 app/styles/modules/team/team-table.scss       | 15 ++++--
 3 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/app/partials/views/modules/team/team-table.jade b/app/partials/views/modules/team/team-table.jade
index 265325ad..f926f334 100644
--- a/app/partials/views/modules/team/team-table.jade
+++ b/app/partials/views/modules/team/team-table.jade
@@ -1,30 +1,31 @@
 section.table-team.basic-table
     header.row.team-header
         div.username
-        div.attribute.attribute-name(ng-if="issuesEnabled")
-            span Mr. Wolf
-            div.popover.attribute-explanation
-                span I see, you solve issues!
-        div.attribute(ng-if="tasksEnabled")
-            span Poison Drinker
-            div.popover.attribute-explanation
-                span Hey, are you a iocaine-holic?
-        div.attribute(ng-if="wikiEnabled")
-            span Cervantes
-            div.popover.attribute-explanation
-                span You have no fear to the blank page!
-        div.attribute(ng-if="issuesEnabled")
-            Total Bug Hunter
-            div.popover.attribute-explanation
-                span Thaks to you, this project still alive.
-        div.attribute(ng-if="tasksEnabled")
-            span Night Shift
-            div.popover.attribute-explanation
-                span Poor Devil, you work too much.
-        div.attribute
-            Total Power
-            div.popover.attribute-explanation
-                span How far did you go into this Taiga?
+        div.member-stats
+            div.attribute.attribute-name(ng-if="issuesEnabled")
+                span Mr. Wolf
+                div.popover.attribute-explanation
+                    span I see, you solve issues!
+            div.attribute(ng-if="tasksEnabled")
+                span Poison Drinker
+                div.popover.attribute-explanation
+                    span Hey, are you a iocaine-holic?
+            div.attribute(ng-if="wikiEnabled")
+                span Cervantes
+                div.popover.attribute-explanation
+                    span You have no fear to the blank page!
+            div.attribute(ng-if="issuesEnabled")
+                Total Bug Hunter
+                div.popover.attribute-explanation
+                    span Thaks to you, this project still alive.
+            div.attribute(ng-if="tasksEnabled")
+                span Night Shift
+                div.popover.attribute-explanation
+                    span Poor Devil, you work too much.
+            div.attribute
+                Total Power
+                div.popover.attribute-explanation
+                    span How far did you go into this Taiga?
 
     div.hero(tg-team-current-user, stats="stats", currentuser="currentUser", projectid="projectId", issuesEnabled="issuesEnabled", tasksenabled="tasksEnabled", wikienabled="wikiEnabled")
 
diff --git a/app/styles/dependencies/colors.scss b/app/styles/dependencies/colors.scss
index 2efb3ae5..e5f37455 100755
--- a/app/styles/dependencies/colors.scss
+++ b/app/styles/dependencies/colors.scss
@@ -2,8 +2,8 @@
 
 $black: #000;
 $blackish: #050505;
-$gray: #555;
 $grayer: #444;
+$gray: #555;
 $gray-light: #b8b8b8;
 $whitish: #f5f5f5;
 $very-light-gray: #fcfcfc;
diff --git a/app/styles/modules/team/team-table.scss b/app/styles/modules/team/team-table.scss
index bed23da5..a0a95283 100644
--- a/app/styles/modules/team/team-table.scss
+++ b/app/styles/modules/team/team-table.scss
@@ -3,14 +3,18 @@
         padding: .5rem;
     }
     .username {
-        @include table-flex-child(3, 0, 0);
+        @include flex(5);
+        min-width: 300px;
     }
     .member-stats {
-        @include table-flex(stretch, center, flex, row, wrap, flex-start);
-        @include table-flex-child(6, 0, 0);
+        @include display(flex);
+        @include align-content(center);
+        @include align-items(center);
+        @include justify-content(flex-end);
+        @include flex(6);
     }
     .attribute {
-        @include table-flex-child(1, 0, 0);
+        @include flex(1);
         position: relative;
         text-align: center;
         .icon,
@@ -36,8 +40,9 @@
         }
     }
     .leave-project {
+        @extend %small;
+        color: $gray-light;
         display: block;
-        margin-top: .3rem;
         .icon {
             margin-right: .2rem;
         }