diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-07-11 12:59:01 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-07-14 15:36:53 -0500 |
| commit | 2ed52071522f3cafd12ee8d9cd15d53db4171e1b (patch) | |
| tree | 0016d72538d2c65f3a2798adf60f66979172a19b | |
| parent | 42a1dc50414909fd1907b5bef57219ea9361c6b4 (diff) | |
| download | gitlab-ce-2ed52071522f3cafd12ee8d9cd15d53db4171e1b.tar.gz | |
Rename .group-controls to .controls
| -rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 4 | ||||
| -rw-r--r-- | app/views/admin/groups/_group.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index 701b9388454..a0b8bd2e28d 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -44,7 +44,7 @@ display: -ms-flexbox; display: flex; - .group-avatar, .group-details, .group-controls { + .group-avatar, .group-details, .controls { display: -webkit-flex; display: -ms-flexbox; display: flex; @@ -56,7 +56,7 @@ min-width: 0; } - .group-controls { + .controls { align-items: center; a { diff --git a/app/views/admin/groups/_group.html.haml b/app/views/admin/groups/_group.html.haml index 59fd6c3fea0..02b943141e4 100644 --- a/app/views/admin/groups/_group.html.haml +++ b/app/views/admin/groups/_group.html.haml @@ -15,6 +15,6 @@ - if group.description.present? .description = markdown(group.description, pipeline: :description) - .group-controls.hidden-xs + .controls.hidden-xs = link_to 'Edit', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: 'btn' = link_to 'Delete', [:admin, group], data: { confirm: "Are you sure you want to remove #{group.name}?" }, method: :delete, class: 'btn btn-remove' |