Commit 74a1cda0 authored by Annabel Gray's avatar Annabel Gray

Merge branch 'bootstrap-emails-verify-badge' into 'master'

Fix email verification badge

Closes #46818

See merge request gitlab-org/gitlab-ce!19217
parents f2f55afd 8288a0ef
...@@ -405,7 +405,7 @@ table.u2f-registrations { ...@@ -405,7 +405,7 @@ table.u2f-registrations {
margin-right: $gl-padding / 4; margin-right: $gl-padding / 4;
} }
.label-verification-status { .badge-verification-status {
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
Your Public Email will be displayed on your public profile. Your Public Email will be displayed on your public profile.
%li %li
All email addresses will be used to identify your commits. All email addresses will be used to identify your commits.
%ul.well-list %ul.content-list
%li %li
= render partial: 'shared/email_with_badge', locals: { email: @primary_email, verified: current_user.confirmed? } = render partial: 'shared/email_with_badge', locals: { email: @primary_email, verified: current_user.confirmed? }
%span.float-right %span.float-right
......
- css_classes = %w(label label-verification-status) - css_classes = %w(badge badge-verification-status)
- css_classes << (verified ? 'verified': 'unverified') - css_classes << (verified ? 'verified': 'unverified')
- text = verified ? 'Verified' : 'Unverified' - text = verified ? 'Verified' : 'Unverified'
......
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