diff options
author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-05-21 17:45:09 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-05-21 17:45:09 +0000 |
commit | cd140f931dab2e8e6d454a64b65204836229ac42 (patch) | |
tree | d481383932c4fe1ad94a5228e71f3dfe0b02445c | |
parent | 3a6b82293f8b578886bc8330e76025b08af826be (diff) | |
parent | 4f2426f51e31980ba4d4e5ac1d41873b61201fc6 (diff) | |
download | gitlab-ce-cd140f931dab2e8e6d454a64b65204836229ac42.tar.gz |
Merge branch '39304-broadcast-message-buttons' into 'master'
Update broadcast message icons
Closes #39304
See merge request gitlab-org/gitlab-ce!28496
-rw-r--r-- | app/views/admin/broadcast_messages/index.html.haml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/39304-broadcast-message-buttons.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml index 9ef58faf8cc..eb4dfdf2858 100644 --- a/app/views/admin/broadcast_messages/index.html.haml +++ b/app/views/admin/broadcast_messages/index.html.haml @@ -32,7 +32,7 @@ %td = message.ends_at %td - = link_to icon('pencil-square-o'), edit_admin_broadcast_message_path(message), title: 'Edit', class: 'btn btn-sm' - = link_to icon('times'), admin_broadcast_message_path(message), method: :delete, remote: true, title: 'Remove', class: 'js-remove-tr btn btn-sm btn-danger' + = link_to sprite_icon('pencil-square'), edit_admin_broadcast_message_path(message), title: 'Edit', class: 'btn' + = link_to sprite_icon('remove'), admin_broadcast_message_path(message), method: :delete, remote: true, title: 'Remove', class: 'js-remove-tr btn btn-danger' = paginate @broadcast_messages, theme: 'gitlab' diff --git a/changelogs/unreleased/39304-broadcast-message-buttons.yml b/changelogs/unreleased/39304-broadcast-message-buttons.yml new file mode 100644 index 00000000000..7eb289fca1f --- /dev/null +++ b/changelogs/unreleased/39304-broadcast-message-buttons.yml @@ -0,0 +1,5 @@ +--- +title: Update broadcast message action icons +merge_request: 28496 +author: Jarek Ostrowski @jareko +type: fixed |