Commit f57290c3 authored by Simon Knox's avatar Simon Knox

Merge branch...

Merge branch '344379-make-badges-in-app-views-projects-mirrors-_mirror_repos-html-haml-pajamas-compliant' into 'master'

Make badge in mirrors/_mirror_repos partial Pajamas-compliant

See merge request gitlab-org/gitlab!77217
parents 6147e3b5 1f81b0b4
......@@ -316,12 +316,6 @@
}
}
.mirror-error-badge {
background-color: $red-400;
border-radius: $border-radius-default;
color: $white;
}
.push-pull-table {
margin-top: 1em;
}
......
......@@ -69,7 +69,7 @@
- if mirror.disabled?
= render 'projects/mirrors/disabled_mirror_badge'
- if mirror.last_error.present?
.badge.mirror-error-badge{ data: { toggle: 'tooltip', html: 'true', qa_selector: 'mirror_error_badge' }, title: html_escape(mirror.last_error.try(:strip)) }= _('Error')
= gl_badge_tag _('Error'), { variant: :danger }, { data: { toggle: 'tooltip', html: 'true', qa_selector: 'mirror_error_badge' }, title: html_escape(mirror.last_error.try(:strip)) }
%td.gl-display-flex
- if mirror_settings_enabled
%button.js-delete-mirror.qa-delete-mirror.rspec-delete-mirror.btn.btn-icon.gl-button.btn-danger.gl-mr-3{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= sprite_icon('remove')
......
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