summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-05-29 14:45:34 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-05-29 14:45:34 -0500
commit8288a0ef8d5af3bfe2ed6c71efdf59def01da39c (patch)
treea27253794dcfe2a5d8c521ca8bdda6589572f35d
parentff575b782e53e42a85ebfe65a559864f45c848b1 (diff)
downloadgitlab-ce-8288a0ef8d5af3bfe2ed6c71efdf59def01da39c.tar.gz
Fix email verification badge
-rw-r--r--app/assets/stylesheets/pages/profile.scss2
-rw-r--r--app/views/profiles/emails/index.html.haml2
-rw-r--r--app/views/shared/_email_with_badge.html.haml2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 06078f1d12e..5d0d59e12f2 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -405,7 +405,7 @@ table.u2f-registrations {
margin-right: $gl-padding / 4;
}
- .label-verification-status {
+ .badge-verification-status {
border-width: 1px;
border-style: solid;
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 914bd4eb57c..a5db9dbe7f8 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -29,7 +29,7 @@
Your Public Email will be displayed on your public profile.
%li
All email addresses will be used to identify your commits.
- %ul.well-list
+ %ul.content-list
%li
= render partial: 'shared/email_with_badge', locals: { email: @primary_email, verified: current_user.confirmed? }
%span.float-right
diff --git a/app/views/shared/_email_with_badge.html.haml b/app/views/shared/_email_with_badge.html.haml
index b7bbc109238..ad863b1967d 100644
--- a/app/views/shared/_email_with_badge.html.haml
+++ b/app/views/shared/_email_with_badge.html.haml
@@ -1,4 +1,4 @@
-- css_classes = %w(label label-verification-status)
+- css_classes = %w(badge badge-verification-status)
- css_classes << (verified ? 'verified': 'unverified')
- text = verified ? 'Verified' : 'Unverified'