Merge branch 'email-settings' into 'master'

Emails settings

Closes #13857 

![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87ee4b0abf970c1fbb5e8a8c02740c/email-settings.png)

See merge request !3032

3 files changed, 60 insertions, 46 deletions

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index ab9ddbc81a5..0586bab68ec 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -93,6 +93,9 @@ $border-red-light: #E52C5A;
 $border-red-normal: #D22852;
 $border-red-dark: #CA264F;
 
+$help-well-bg: #FAFAFA;
+$help-well-border: #E5E5E5;
+
 /* header */
 $light-grey-header: #faf9f9;
 
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 08b14b4cac5..726dcbb36a9 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -55,6 +55,18 @@
   }
 }
 
+.account-well {
+  padding: 10px 10px;
+  background-color: $help-well-bg;
+  border: 1px solid $help-well-border;
+  border-radius: $border-radius-base;
+
+  ul {
+    padding-left: 20px;
+    margin-bottom: 0;
+  }
+}
+
 .calendar-hint {
   margin-top: -12px;
   float: right;
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 705e1804717..3f328f96cea 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -1,50 +1,49 @@
 - page_title "Emails"
 - header_title page_title, profile_emails_path
 
-.alert.alert-help.prepend-top-default
-  %ul
-    %li
-      Your
-      %b Primary Email
-      will be used for avatar detection and web based operations, such as edits and merges.
-    %li
-      Your
-      %b Notification Email
-      will be used for account notifications.
-    %li
-      Your
-      %b Public Email
-      will be displayed on your public profile.
-    %li
-      All email addresses will be used to identify your commits.
-
-.panel.panel-default
-  .panel-heading
-    Emails (#{@emails.count + 1})
-  %ul.well-list#emails-table
-    %li
-      %strong= @primary
-      %span.label.label-success Primary Email
-      - if @primary === current_user.public_email
-        %span.label.label-info Public Email
-      - if @primary === current_user.notification_email
-        %span.label.label-info Notification Email
-    - @emails.each do |email|
+.row.prepend-top-default
+  .col-lg-3.profile-settings-sidebar
+    %h4.prepend-top-0
+      = page_title
+    %p
+      Control emails linked to your account
+  .col-lg-9
+    %h4.prepend-top-0
+      Add email address
+    = form_for 'email', url: profile_emails_path do |f|
+      .form-group
+        = f.label :email, class: 'label-light'
+        = f.text_field :email, class: 'form-control'
+      .prepend-top-default
+        = f.submit 'Add email address', class: 'btn btn-create'
+    %hr
+    %h4.prepend-top-0
+      Linked emails (#{@emails.count + 1})
+    .account-well.append-bottom-default
+      %ul
+        %li
+          Your Primary Email will be used for avatar detection and web based operations, such as edits and merges.
+        %li
+          Your Notification Email will be used for account notifications.
+        %li
+          Your Public Email will be displayed on your public profile.
+        %li
+          All email addresses will be used to identify your commits.
+    %ul.well-list
       %li
-        %strong= email.email
-        - if email.email === current_user.public_email
-          %span.label.label-info Public Email
-        - if email.email === current_user.notification_email
-          %span.label.label-info Notification Email
-        %span.cgray
-          added #{time_ago_with_tooltip(email.created_at)}
-        = link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-remove pull-right'
-
-%h4 Add email address
-= form_for 'email', url: profile_emails_path, html: { class: 'form-horizontal' } do |f|
-  .form-group
-    = f.label :email, class: 'control-label'
-    .col-sm-10
-      = f.text_field :email, class: 'form-control'
-  .form-actions
-    = f.submit 'Add email address', class: 'btn btn-create'
+        = @primary
+        %span.pull-right
+          %span.label.label-success Primary Email
+          - if @primary === current_user.public_email
+            %span.label.label-info Public Email
+          - if @primary === current_user.notification_email
+            %span.label.label-info Notification Email
+      - @emails.each do |email|
+        %li
+          = email.email
+          %span.pull-right
+            - if email.email === current_user.public_email
+              %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'