diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-30 10:03:17 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-30 10:03:17 +0000 |
| commit | 47ed0a990bda27147b785615e0084f7999b39e12 (patch) | |
| tree | 23942bb44e056d266014c05fc0a1a6095c61b7c5 | |
| parent | dfe9d49534a26e86c773d81a4f5b81165efdd506 (diff) | |
| parent | 0dfa63739263dc0d7524a387a40ce08984c444bc (diff) | |
| download | gitlab-ce-47ed0a990bda27147b785615e0084f7999b39e12.tar.gz | |
Merge branch '41802-add-space-to-edit-delete-tag-btns' into 'master'
Resolve "Missing space between edit and delete buttons in tag list"
Closes #41802
See merge request gitlab-org/gitlab-ce!16757
| -rw-r--r-- | app/views/projects/tags/_tag.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/41802-add-space-to-edit-delete-tag-btns.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml index 467f19b4c56..55e45a5e954 100644 --- a/app/views/projects/tags/_tag.html.haml +++ b/app/views/projects/tags/_tag.html.haml @@ -32,5 +32,5 @@ = icon("pencil") - if can?(current_user, :admin_project, @project) - = link_to project_tag_path(@project, tag.name), class: "btn btn-remove remove-row has-tooltip #{protected_tag?(@project, tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), method: :delete, data: { confirm: s_('TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?') % { tag_name: tag.name }, container: 'body' }, remote: true do + = link_to project_tag_path(@project, tag.name), class: "btn btn-remove remove-row has-tooltip prepend-left-10 #{protected_tag?(@project, tag) ? 'disabled' : ''}", title: s_('TagsPage|Delete tag'), method: :delete, data: { confirm: s_('TagsPage|Deleting the %{tag_name} tag cannot be undone. Are you sure?') % { tag_name: tag.name }, container: 'body' }, remote: true do = icon("trash-o") diff --git a/changelogs/unreleased/41802-add-space-to-edit-delete-tag-btns.yml b/changelogs/unreleased/41802-add-space-to-edit-delete-tag-btns.yml new file mode 100644 index 00000000000..f23a6452b0d --- /dev/null +++ b/changelogs/unreleased/41802-add-space-to-edit-delete-tag-btns.yml @@ -0,0 +1,5 @@ +--- +title: Adds spacing between edit and delete tag btn in tag list +merge_request: 16757 +author: Jacopo Beschi @jacopo-beschi +type: fixed |