diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-29 16:54:19 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-03 09:43:03 +0000 |
commit | 785bce1cb29d835791763a85394b4421733db1ff (patch) | |
tree | 6374ed623cb83195b2f0e6ae770e4123f8967468 | |
parent | aa664af3ddf4dcce06be93f3f224dd62e72fae32 (diff) | |
download | gitlab-ce-785bce1cb29d835791763a85394b4421733db1ff.tar.gz |
Merge branch 'notification-email-badge-alignment' into 'master'
Updated spacing between notification label and button
![Screen_Shot_2016-04-28_at_11.36.26](/uploads/7b33e78e85688d96f878272ee93038ba/Screen_Shot_2016-04-28_at_11.36.26.png)
Closes #16552
See merge request !3965
-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 3f328f96cea..7844dcb33af 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -46,4 +46,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' |