summaryrefslogtreecommitdiff
path: root/app/views/projects/project_members/_team.html.haml
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-05-03 18:33:03 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-05-03 18:33:03 +0100
commit2b075561f9213530d1911bea875c5ed9ac42b1a6 (patch)
tree2d72260c7c5947dea390a97f4f444b191a6079c1 /app/views/projects/project_members/_team.html.haml
parenta5989900c9c001eaee971969b89a708f132c6d7c (diff)
parente14ca5394edf0497184415f12629dfdbe72a2727 (diff)
downloadgitlab-ce-31156-environments-vue-service.tar.gz
Merge branch 'master' into 31156-environments-vue-service31156-environments-vue-service
* master: (91 commits) Move api lint out of static analysis job Fix project tree saver and fork spec failures Fix lazy error handling of cron parser Use gitlab-workhorse 2.0.0 Revert to real click seeing as that was a bug with only the original branch Fixed issue_sidebar_spec.rb click as true click cannot hit the right element and removed sleep find and match first dropdown before clicking Elaborate on the usage of Spring Note Ghost user and refer to user deletion documentation Fix label creation from issuable for subgroup projects Detect already enabled DeployKeys in EnableDeployKeyService Extract common parts of snippet and blob pages into partial update article date link ldap-ee article from auth index add ldap article and changes from !10299 Fix misaligned buttons in wiki pages Improve pipelines_finder.rb Improve documentation Correct typo in pipelines_spec.rb Avoid using sample ...
Diffstat (limited to 'app/views/projects/project_members/_team.html.haml')
-rw-r--r--app/views/projects/project_members/_team.html.haml10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/views/projects/project_members/_team.html.haml b/app/views/projects/project_members/_team.html.haml
index 81d57c77edf..7b1a26043e1 100644
--- a/app/views/projects/project_members/_team.html.haml
+++ b/app/views/projects/project_members/_team.html.haml
@@ -1,9 +1,11 @@
.panel.panel-default
- .panel-heading
- Members with access to
- %strong= @project.name
+ .panel-heading.flex-project-members-panel
+ %span.flex-project-title
+ Members of
+ %strong
+ #{@project.name}
%span.badge= @project_members.total_count
- = form_tag namespace_project_settings_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form' do
+ = form_tag namespace_project_settings_members_path(@project.namespace, @project), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
.form-group
= search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
%button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }