diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-29 16:54:19 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-29 16:54:19 +0000 |
| commit | 535896cd1cf7fad3b22b55589e63ddb01e0f267a (patch) | |
| tree | ca4e6da2a79b447e1f0c7a470c6e118c4e7cab76 /app/views/profiles | |
| parent | 79c27e6a7ba9b8f82ce1762206e5879e4c0c5fd4 (diff) | |
| parent | 4fcf2fb9e779cbc8ce872a15c5c7657471d1ddba (diff) | |
| download | gitlab-ce-535896cd1cf7fad3b22b55589e63ddb01e0f267a.tar.gz | |
Merge branch 'notification-email-badge-alignment' into 'master'
Updated spacing between notification label and button
Closes #16552
See merge request !3965
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/emails/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml index 57527361eb6..6f7fefdb46d 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -45,4 +45,4 @@ %span.label.label-info Public Email - if email.email === current_user.notification_email %span.label.label-info Notification Email - = link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-remove pull-right' + = link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-warning prepend-left-10' |