Commit a848c4b3 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'mw-replace-fa-circle-in-runners-helper' into 'master'

Replace fa-circle in runners helper

See merge request gitlab-org/gitlab!48981
parents f0afb27e 10ea3b9c
...@@ -12,16 +12,18 @@ ...@@ -12,16 +12,18 @@
} }
} }
.runner-status-online { .runner-status {
color: $green-600; &.runner-status-online {
} background-color: $green-600;
}
.runner-status-offline { &.runner-status-offline {
color: $gray-darkest; background-color: $gray-darkest;
} }
.runner-status-paused { &.runner-status-paused {
color: $red-500; background-color: $red-500;
}
} }
.runner { .runner {
......
...@@ -8,14 +8,14 @@ module Ci ...@@ -8,14 +8,14 @@ module Ci
status = runner.status status = runner.status
case status case status
when :not_connected when :not_connected
content_tag(:span, title: "New runner. Has not connected yet") do content_tag(:span, title: _("New runner. Has not connected yet")) do
sprite_icon("warning-solid", size: 24, css_class: "gl-vertical-align-bottom!") sprite_icon("warning-solid", size: 24, css_class: "gl-vertical-align-bottom!")
end end
when :online, :offline, :paused when :online, :offline, :paused
content_tag :i, nil, content_tag :span, nil,
class: "fa fa-circle runner-status-#{status}", class: "gl-display-inline-block gl-avatar gl-avatar-s16 gl-avatar-circle runner-status runner-status-#{status}",
title: "Runner is #{status}, last contact was #{time_ago_in_words(runner.contacted_at)} ago" title: _("Runner is %{status}, last contact was %{runner_contact} ago") % { status: status, runner_contact: time_ago_in_words(runner.contacted_at) }
end end
end end
......
---
title: Replace fa-cirlce in runners helper
merge_request: 48981
author:
type: changed
...@@ -18424,6 +18424,9 @@ msgstr "" ...@@ -18424,6 +18424,9 @@ msgstr ""
msgid "New response for issue #%{issue_iid}:" msgid "New response for issue #%{issue_iid}:"
msgstr "" msgstr ""
msgid "New runner. Has not connected yet"
msgstr ""
msgid "New runners registration token has been generated!" msgid "New runners registration token has been generated!"
msgstr "" msgstr ""
...@@ -23541,6 +23544,9 @@ msgstr "" ...@@ -23541,6 +23544,9 @@ msgstr ""
msgid "Runner cannot be assigned to other projects" msgid "Runner cannot be assigned to other projects"
msgstr "" msgstr ""
msgid "Runner is %{status}, last contact was %{runner_contact} ago"
msgstr ""
msgid "Runner runs jobs from all unassigned projects" msgid "Runner runs jobs from all unassigned projects"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment