Commit e9131774 authored by Phil Hughes's avatar Phil Hughes

Merge branch '344324-make-email-with-badge-pj-compliant' into 'master'

Make badges in email_with_badge pajamas compliant

See merge request gitlab-org/gitlab!76127
parents 0c2bda9a 56132291
...@@ -329,16 +329,6 @@ table.u2f-registrations { ...@@ -329,16 +329,6 @@ table.u2f-registrations {
} }
} }
.email-badge {
display: inline;
margin-right: $gl-padding / 2;
.email-badge-email {
display: inline;
margin-right: $gl-padding / 4;
}
}
.edit-user { .edit-user {
svg { svg {
fill: $gl-text-color-secondary; fill: $gl-text-color-secondary;
......
- css_classes = %w(badge gl-badge) - variant = verified ? :success : :danger
- css_classes << (verified ? 'badge-success': 'badge-danger')
- text = verified ? _('Verified') : _('Unverified') - text = verified ? _('Verified') : _('Unverified')
.email-badge = email
.email-badge-email= email = gl_badge_tag text, { variant: variant }, { class: 'gl-ml-3' }
%div{ class: css_classes }
= text
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