From 3354bfd8f92ba034816890f0ea89bca630405103 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 5 Sep 2016 15:45:23 +0100
Subject: [PATCH] CSS cleanup

---
 app/assets/stylesheets/framework/selects.scss          |  4 ----
 app/assets/stylesheets/pages/members.scss              | 10 +++-------
 .../groups/group_members/_new_group_member.html.haml   |  2 +-
 app/views/groups/group_members/index.html.haml         |  2 +-
 .../project_members/_new_project_member.html.haml      |  2 +-
 app/views/projects/project_members/index.html.haml     |  2 +-
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss
index 746ab89abd2..b309e2ad9f4 100644
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -191,10 +191,6 @@
   &.input-clamp {
     max-width: 100%;
   }
-
-  &.input-full {
-    width: 100%;
-  }
 }
 
 .select2-highlighted {
diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss
index a7f1324f69a..72f31cb1168 100644
--- a/app/assets/stylesheets/pages/members.scss
+++ b/app/assets/stylesheets/pages/members.scss
@@ -1,9 +1,3 @@
-.project-members-new {
-  > h5 {
-    font-weight: normal;
-  }
-}
-
 .member {
   .list-item-name {
     float: none;
@@ -16,6 +10,7 @@
 
   .controls {
     @media (min-width: $screen-sm-min) {
+      display: -webkit-flex;
       display: flex;
       width: 400px;
       max-width: 50%;
@@ -26,8 +21,9 @@
     margin-top: 5px;
 
     @media (min-width: $screen-sm-min) {
+      display: -webkit-flex;
       display: flex;
-      flex: 1;
+      width: 100%;
       margin-top: 3px;
     }
   }
diff --git a/app/views/groups/group_members/_new_group_member.html.haml b/app/views/groups/group_members/_new_group_member.html.haml
index 2987befd2a4..b185b81db7f 100644
--- a/app/views/groups/group_members/_new_group_member.html.haml
+++ b/app/views/groups/group_members/_new_group_member.html.haml
@@ -1,7 +1,7 @@
 = form_for @group_member, url: group_group_members_path(@group), html: { class: 'users-project-form users-group-form' } do |f|
   .row
     .col-md-4.col-lg-6
-      = users_select_tag(:user_ids, multiple: true, class: 'input-full', scope: :all, email_user: true)
+      = users_select_tag(:user_ids, multiple: true, class: 'input-clamp', scope: :all, email_user: true)
       .help-block.append-bottom-10
         Search for users by name, username, or email, or invite new ones using their email address.
 
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index d2c7ec2e821..ebf9aca7700 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -6,7 +6,7 @@
   %hr
   - if can?(current_user, :admin_group_member, @group)
     .project-members-new.append-bottom-default
-      %h5.clearfix
+      %p.clearfix
         Add new user to
         %strong= @group.name
       = render "new_group_member"
diff --git a/app/views/projects/project_members/_new_project_member.html.haml b/app/views/projects/project_members/_new_project_member.html.haml
index 26e06a14c07..79dcd7a6ee9 100644
--- a/app/views/projects/project_members/_new_project_member.html.haml
+++ b/app/views/projects/project_members/_new_project_member.html.haml
@@ -1,7 +1,7 @@
 = form_for @project_member, as: :project_member, url: namespace_project_project_members_path(@project.namespace, @project), html: { class: 'users-project-form' } do |f|
   .row
     .col-md-4.col-lg-6
-      = users_select_tag(:user_ids, multiple: true, class: "input-full", scope: :all, email_user: true)
+      = users_select_tag(:user_ids, multiple: true, class: "input-clamp", scope: :all, email_user: true)
       .help-block.append-bottom-10
         Search for users by name, username, or email, or invite new ones using their email address.
 
diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml
index 80882d0c11c..86b2752cc0b 100644
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
@@ -7,7 +7,7 @@
   %hr
   - if can?(current_user, :admin_project_member, @project)
     .project-members-new.append-bottom-default
-      %h5.clearfix
+      %p.clearfix
         Add new user to
         %strong= @project.name
       = render "new_project_member"