diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 21:07:47 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-09 21:07:47 +0000 |
| commit | 5fcb0919220c7b2ebe73c8dbece38ecf3472ed5d (patch) | |
| tree | 1ef501134b4f903e08af51cd7ada44e6adc18212 /app/views/groups | |
| parent | 600078cccf994ad6e4f9d5cd5192ac2b4da89856 (diff) | |
| parent | cdcca06b143c85e48196993a29ee73f746463dc9 (diff) | |
| download | gitlab-ce-5fcb0919220c7b2ebe73c8dbece38ecf3472ed5d.tar.gz | |
Merge branch 'dz-improve-ui-consistency-2' into 'master'
Improve ui consistency. Part 2
* Use responsive top-area on project branches and tags pages
* Use default button size in the content list controls
* Improve button margin for btn-grouped css class
For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324
See merge request !4536
Diffstat (limited to 'app/views/groups')
| -rw-r--r-- | app/views/groups/group_members/_group_member.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/groups/group_members/_group_member.html.haml b/app/views/groups/group_members/_group_member.html.haml index 271700e6db4..6bb542e658d 100644 --- a/app/views/groups/group_members/_group_member.html.haml +++ b/app/views/groups/group_members/_group_member.html.haml @@ -34,7 +34,7 @@ %strong.member-access-level= member.human_access - if show_controls - if can?(current_user, :update_group_member, member) - = button_tag class: "btn-xs btn js-toggle-button", + = button_tag class: "btn-xs btn btn-grouped inline js-toggle-button", title: 'Edit access level', type: 'button' do = icon('pencil') |