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

Fix email verification badge (EE)

See merge request gitlab-org/gitlab-ee!5888

app/assets/stylesheets/pages/profile.scss

@@ -402,7 +402,7 @@ table.u2f-registrations {
     margin-right: $gl-padding / 4;
   }
 
-  .label-verification-status {
+  .badge-verification-status {
     border-width: 1px;
     border-style: solid;
 

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

app/views/shared/_email_with_badge.html.haml

-- css_classes = %w(badge label-verification-status)
+- css_classes = %w(badge badge-verification-status)
 - css_classes << (verified ? 'verified': 'unverified')
 - text = verified ? 'Verified' : 'Unverified'