Redesign team.members pages

1 files changed, 19 insertions, 18 deletions

diff --git a/app/views/teams/members/_show.html.haml b/app/views/teams/members/_show.html.haml
index 1a323043d09..dc32acb4693 100644
--- a/app/views/teams/members/_show.html.haml
+++ b/app/views/teams/members/_show.html.haml
@@ -2,7 +2,7 @@
 - allow_admin = can? current_user, :manage_user_team, @team
 %li{id: dom_id(member), class: "team_member_row user_#{user.id}"}
   .row
-    .span5
+    .span4
       = link_to user_path(user.username), title: user.name, class: "dark" do
         = image_tag gravatar_icon(user.email, 40), class: "avatar s32"
       = link_to user_path(user.username), title: user.name, class: "dark" do
@@ -10,21 +10,22 @@
         %br
         %small.cgray= user.username
 
-    .span4
+    .span7.pull-right
       - if allow_admin
-        = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f|
-          = f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium trigger-submit"
-          %br
-          = label_tag do
-            = f.check_box :group_admin, class: 'trigger-submit'
-            %span Admin access
-    .pull-right
-      - if current_user == user
-        %span.btn.disabled This is you!
-      - if @team.owner == user
-        %span.btn.disabled Owner
-      - elsif user.blocked?
-        %span.btn.disabled.blocked Blocked
-      - elsif allow_admin
-        = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do
-          %i.icon-minus.icon-white
+        .pull-left
+          = form_for(member, as: :team_member, url: team_member_path(@team, user)) do |f|
+            = label_tag do
+              = f.check_box :group_admin, class: 'trigger-submit'
+              %span Admin access
+             
+            = f.select :permission, options_for_select(UsersProject.access_roles, @team.default_projects_access(user)), {}, class: "medium trigger-submit"
+      .pull-right
+        - if current_user == user
+          %span.btn.disabled This is you!
+        - if @team.owner == user
+          %span.btn.disabled Owner
+        - elsif user.blocked?
+          %span.btn.disabled.blocked Blocked
+        - elsif allow_admin
+          = link_to team_member_path(@team, user), confirm: remove_from_user_team_message(@team, user), method: :delete, class: "btn-tiny btn btn-remove", title: "Remove from team" do
+            %i.icon-minus.icon-white