diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-06-29 17:06:56 -0400 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-07-03 11:15:43 -0400 |
| commit | d580ccf98ce20ead1329a103cf5000deb74110a6 (patch) | |
| tree | 6c1bb3e5c91666a97198d9cf7a1ffd90988263bd | |
| parent | c8eef2d2a62f6ac7304c8ab4d50282613e21ec8a (diff) | |
| download | gitlab-ce-32048-shared-runners-admin-buttons-have-odd-spacing.tar.gz | |
Replace existing runner links with icons and tooltips, move into btn-group.32048-shared-runners-admin-buttons-have-odd-spacing
| -rw-r--r-- | app/assets/stylesheets/pages/runners.scss | 17 | ||||
| -rw-r--r-- | app/views/admin/runners/_runner.html.haml | 17 | ||||
| -rw-r--r-- | changelogs/unreleased/32048-shared-runners-admin-buttons-have-odd-spacing.yml | 4 |
3 files changed, 31 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/runners.scss b/app/assets/stylesheets/pages/runners.scss index 9b6ff237557..57c73295d1e 100644 --- a/app/assets/stylesheets/pages/runners.scss +++ b/app/assets/stylesheets/pages/runners.scss @@ -33,3 +33,20 @@ font-weight: normal; } } + +.admin-runner-btn-group-cell { + min-width: 150px; + + .btn-sm { + padding: 4px 9px; + } + + .btn-default { + color: $gl-text-color-secondary; + } + + .fa-pause, + .fa-play { + font-size: 11px; + } +} diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml index d4d166ab7b6..140688b52d3 100644 --- a/app/views/admin/runners/_runner.html.haml +++ b/app/views/admin/runners/_runner.html.haml @@ -32,13 +32,16 @@ #{time_ago_in_words(runner.contacted_at)} ago - else Never - %td - .pull-right - = link_to 'Edit', admin_runner_path(runner), class: 'btn btn-sm' + %td.admin-runner-btn-group-cell + .pull-right.btn-group + = link_to admin_runner_path(runner), class: 'btn btn-sm btn-default has-tooltip', title: 'Edit', ref: 'tooltip', aria: { label: 'Edit' }, data: { placement: 'top', container: 'body'} do + = icon('pencil') - if runner.active? - = link_to 'Pause', [:pause, :admin, runner], data: { confirm: "Are you sure?" }, method: :get, class: 'btn btn-danger btn-sm' + = link_to [:pause, :admin, runner], method: :get, class: 'btn btn-sm btn-default has-tooltip', title: 'Pause', ref: 'tooltip', aria: { label: 'Pause' }, data: { placement: 'top', container: 'body', confirm: "Are you sure?" } do + = icon('pause') - else - = link_to 'Resume', [:resume, :admin, runner], method: :get, class: 'btn btn-success btn-sm' - = link_to 'Remove', [:admin, runner], data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm' - + = link_to [:resume, :admin, runner], method: :get, class: 'btn btn-default btn-sm has-tooltip', title: 'Resume', ref: 'tooltip', aria: { label: 'Resume' }, data: { placement: 'top', container: 'body'} do + = icon('play') + = link_to [:admin, runner], method: :delete, class: 'btn btn-danger btn-sm has-tooltip', title: 'Remove', ref: 'tooltip', aria: { label: 'Remove' }, data: { placement: 'top', container: 'body', confirm: "Are you sure?" } do + = icon('remove') diff --git a/changelogs/unreleased/32048-shared-runners-admin-buttons-have-odd-spacing.yml b/changelogs/unreleased/32048-shared-runners-admin-buttons-have-odd-spacing.yml new file mode 100644 index 00000000000..99e64b9b467 --- /dev/null +++ b/changelogs/unreleased/32048-shared-runners-admin-buttons-have-odd-spacing.yml @@ -0,0 +1,4 @@ +--- +title: Fix spacing on runner buttons. +merge_request: !12535 +author: |