Commit e3c7d264 authored by Tim Zallmann's avatar Tim Zallmann

Updated also Badge + Dropdown Icons

parent df434817
......@@ -5,9 +5,9 @@
- if link && status.has_details?
= link_to status.details_path, class: css_classes, title: title do
= custom_icon(status.icon)
= sprite_icon(status.icon)
= status.text
- else
%span{ class: css_classes, title: title }
= custom_icon(status.icon)
= sprite_icon(status.icon)
= status.text
......@@ -7,11 +7,11 @@
- if status.has_details?
= link_to status.details_path, class: 'mini-pipeline-graph-dropdown-item', data: { toggle: 'tooltip', title: tooltip, container: 'body' } do
%span{ class: klass }= custom_icon(status.icon)
%span{ class: klass }= sprite_icon(status.icon)
%span.ci-build-text= subject.name
- else
.menu-item.mini-pipeline-graph-dropdown-item{ data: { toggle: 'tooltip', title: tooltip, container: 'body' } }
%span{ class: klass }= custom_icon(status.icon)
%span{ class: klass }= sprite_icon(status.icon)
%span.ci-build-text= subject.name
- if status.has_action?
......
......@@ -11,7 +11,7 @@ module Gitlab
end
def icon
'icon_status_canceled'
'status_canceled'
end
def favicon
......
......@@ -11,7 +11,7 @@ module Gitlab
end
def icon
'icon_status_created'
'status_created'
end
def favicon
......
......@@ -11,7 +11,7 @@ module Gitlab
end
def icon
'icon_status_failed'
'status_failed'
end
def favicon
......
......@@ -11,7 +11,7 @@ module Gitlab
end
def icon
'icon_status_manual'
'status_manual'
end
def favicon
......
......@@ -11,7 +11,7 @@ module Gitlab
end
def icon
'icon_status_pending'
'status_pending'
end
def favicon
......
......@@ -11,7 +11,7 @@ module Gitlab
end
def icon
'icon_status_running'
'status_running'
end
def favicon
......
......@@ -11,7 +11,7 @@ module Gitlab
end
def icon
'icon_status_skipped'
'status_skipped'
end
def favicon
......
......@@ -11,7 +11,7 @@ module Gitlab
end
def icon
'icon_status_success'
'status_success'
end
def favicon
......
......@@ -15,7 +15,7 @@ module Gitlab
end
def icon
'icon_status_warning'
'status_warning'
end
def group
......
......@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Canceled do
end
describe '#icon' do
it { expect(subject.icon).to eq 'icon_status_canceled' }
it { expect(subject.icon).to eq 'status_canceled' }
end
describe '#favicon' do
......
......@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Created do
end
describe '#icon' do
it { expect(subject.icon).to eq 'icon_status_created' }
it { expect(subject.icon).to eq 'status_created' }
end
describe '#favicon' do
......
......@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Failed do
end
describe '#icon' do
it { expect(subject.icon).to eq 'icon_status_failed' }
it { expect(subject.icon).to eq 'status_failed' }
end
describe '#favicon' do
......
......@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Manual do
end
describe '#icon' do
it { expect(subject.icon).to eq 'icon_status_manual' }
it { expect(subject.icon).to eq 'status_manual' }
end
describe '#favicon' do
......
......@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Pending do
end
describe '#icon' do
it { expect(subject.icon).to eq 'icon_status_pending' }
it { expect(subject.icon).to eq 'status_pending' }
end
describe '#favicon' do
......
......@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Running do
end
describe '#icon' do
it { expect(subject.icon).to eq 'icon_status_running' }
it { expect(subject.icon).to eq 'status_running' }
end
describe '#favicon' do
......
......@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Skipped do
end
describe '#icon' do
it { expect(subject.icon).to eq 'icon_status_skipped' }
it { expect(subject.icon).to eq 'status_skipped' }
end
describe '#favicon' do
......
......@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::Success do
end
describe '#icon' do
it { expect(subject.icon).to eq 'icon_status_success' }
it { expect(subject.icon).to eq 'status_success' }
end
describe '#favicon' do
......
......@@ -14,7 +14,7 @@ describe Gitlab::Ci::Status::SuccessWarning do
end
describe '#icon' do
it { expect(subject.icon).to eq 'icon_status_warning' }
it { expect(subject.icon).to eq 'status_warning' }
end
describe '#group' do
......
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