From c970adbec21602141d4df353818c3eca969599c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Wed, 19 Nov 2014 18:29:21 +0100
Subject: [PATCH] Fix admin layout in safari and other browsers

---
 app/coffee/modules/admin/roles.coffee          |  3 ++-
 app/coffee/modules/common/lightboxes.coffee    |  1 -
 app/styles/modules/admin/admin-roles.scss      |  6 +++---
 app/styles/modules/common/category-config.scss | 16 +++++++++-------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/coffee/modules/admin/roles.coffee b/app/coffee/modules/admin/roles.coffee
index 3a9111c2..99bae6e1 100644
--- a/app/coffee/modules/admin/roles.coffee
+++ b/app/coffee/modules/admin/roles.coffee
@@ -251,7 +251,8 @@ RolePermissionsDirective = ($rootscope, $repo, $confirm) ->
         <div class="category-items">
             <div class="items-container">
             <% _.each(category.permissions, function(permission) { %>
-                <div class="category-item" data-id="<%- permission.key %>"> <%- permission.description %>
+                <div class="category-item" data-id="<%- permission.key %>">
+                    <span><%- permission.description %></span>
                     <div class="check">
                         <input type="checkbox" <% if(permission.active) { %>checked="checked"<% } %>/>
                         <div></div>
diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee
index a8c33c7b..59b06a7d 100644
--- a/app/coffee/modules/common/lightboxes.coffee
+++ b/app/coffee/modules/common/lightboxes.coffee
@@ -44,7 +44,6 @@ class LightboxService extends taiga.Service
         docEl = angular.element(document)
         docEl.off(".lightbox")
         docEl.off(".keyboard-navigation") # Hack: to fix problems in the WYSIWYG textareas when press ENTER
-
         $el.one "transitionend", =>
             $el.removeAttr('style')
             $el.removeClass("open").removeClass('close')
diff --git a/app/styles/modules/admin/admin-roles.scss b/app/styles/modules/admin/admin-roles.scss
index 29199cc9..5992dc79 100644
--- a/app/styles/modules/admin/admin-roles.scss
+++ b/app/styles/modules/admin/admin-roles.scss
@@ -39,9 +39,9 @@
         padding: .5rem;
     }
     .general-category {
-        align-items: center;
-        display: flex;
-        justify-content: flex-end;
+        @include display(flex);
+        @include align-items(center);
+        @include justify-content(flex-end);
         padding-bottom: 2rem;
         .check {
             margin-left: .5rem;
diff --git a/app/styles/modules/common/category-config.scss b/app/styles/modules/common/category-config.scss
index cd1e831a..0eac6075 100644
--- a/app/styles/modules/common/category-config.scss
+++ b/app/styles/modules/common/category-config.scss
@@ -4,13 +4,14 @@
         border-top: 1px solid $gray-light;
     }
     .resume {
-        @include table-flex($align-items: center);
+        @include display(flex);
+        @include align-items(space-between);
         cursor: pointer;
         padding: 1rem;
         position: relative;
     }
     .resume-title {
-        @include table-flex-child(1, 280px, 0);
+        width: 280px;
     }
     .count {
         color: $gray-light;
@@ -18,7 +19,8 @@
         padding-right: 5px;
     }
     .summary-role {
-        @include table-flex-child(3, 280px, 0);
+        @include flex(1);
+        width: 280px;
         .role-summary-single {
             background: $gray-light;
             display: inline-block;
@@ -34,7 +36,7 @@
         }
     }
     .icon {
-        @include table-flex-child(1, 0, 0);
+        @include flex(1);
         @extend %xlarge;
         text-align: right;
     }
@@ -47,10 +49,10 @@
         }
     }
     .category-item {
-        align-items: center;
+        @include display(flex);
+        @include justify-content(space-between);
+        @include align-items(center);
         border-bottom: 1px solid $very-light-gray;
-        display: flex;
-        justify-content: space-between;
         padding: .5rem .5rem .5rem 2rem;
         &:last-child {
             border-bottom: 0;