Updated markup

app/controllers/profiles/accounts_controller.rb

@@ -8,7 +8,7 @@ class Profiles::AccountsController < Profiles::ApplicationController
       current_user.otp_grace_period_started_at = Time.current
     end
-    current_user.save! if current_user.changed?
+    # current_user.save! if current_user.changed?
     @user = current_user

app/views/profiles/accounts/show.html.haml

@@ -5,7 +5,7 @@
   .alert.alert-info
     Some options are unavailable for LDAP accounts
-.row.prepend-top-default
+.row.prepend-top-default.append-bottom-default
   .col-lg-3.profile-settings-sidebar
     %h4.prepend-top-0
       Private Token
@@ -26,8 +26,8 @@
           = f.submit 'Reset private token', data: { confirm: "Are you sure?" }, class: "btn btn-default"
         - else
           = f.submit 'Generate', class: "btn btn-default"
-%hr
-.row.prepend-top-default
+  .col-sm-12
+    %hr
   .col-lg-3.profile-settings-sidebar
     %h4.prepend-top-0
       Two-factor Authentication
@@ -63,9 +63,9 @@
           = text_field_tag :pin_code, nil, class: "form-control", required: true
         .prepend-top-default
           = submit_tag 'Enable two-factor authentication', class: 'btn btn-success'
-%hr
-- if button_based_providers.any?
-  .row.prepend-top-default
+  .col-sm-12
+    %hr
+  - if button_based_providers.any?
     .col-lg-3.profile-settings-sidebar
       %h4.prepend-top-0
         Social sign-in
@@ -85,9 +85,9 @@
           - else
             = link_to user_omniauth_authorize_path(provider), method: :post, class: "provider-btn #{'not-active' if !auth_active?(provider)}", "data-no-turbolink" => "true" do
               Connect
-  %hr
-- if current_user.can_change_username?
-  .row.prepend-top-default
+    .col-sm-12
+      %hr
+  - if current_user.can_change_username?
     .col-lg-3.profile-settings-sidebar
       %h4.prepend-top-0.change-username-title
         Change username
@@ -108,10 +108,10 @@
           = f.button class: "btn btn-warning", type: "submit" do
             = icon "spinner spin", class: "hidden loading-username"
             Update username
-  %hr
-- if signup_enabled?
-  .row.prepend-top-default
+    .col-sm-12
+      %hr
+  - if signup_enabled?
     .col-lg-3.profile-settings-sidebar
       %h4.prepend-top-0.remove-account-title
         Remove account
@@ -132,4 +132,3 @@
             %strong #{@user.solo_owned_groups.map(&:name).join(', ')}
           %p
             You must transfer ownership or delete these groups before you can delete your account.
-.append-bottom-default

app/views/profiles/applications.html.haml

 - page_title "Applications"
-- header_title page_title, applications_profile_path
+- header_title "Application Settings", applications_profile_path
 .row.prepend-top-default
   .col-lg-3.profile-settings-sidebar

app/views/profiles/audit_log.html.haml

@@ -3,7 +3,7 @@
 .row.prepend-top-default
   .col-lg-3.profile-settings-sidebar
-    %h3.prepend-top-0
+    %h4.prepend-top-0
       = page_title
     %p
       This is a security log of important events involving your account.

app/views/profiles/notifications/show.html.haml

@@ -11,14 +11,14 @@
   = hidden_field_tag :notification_type, 'global'
   .row
     .col-lg-3.profile-settings-sidebar
-      %h4
+      %h4.prepend-top-0
         = page_title
       %p
         You can specify notification level per group or per project.
       %p
         By default, all projects and groups will use the global notifications setting.
     .col-lg-9
-      %h5
+      %h5.prepend-top-0
         Global notification settings
       .form-group
         = f.label :notification_email, class: "label-light"

app/views/profiles/preferences/show.html.haml

@@ -3,7 +3,7 @@
 = form_for @user, url: profile_preferences_path, remote: true, method: :put, html: {class: 'row prepend-top-default js-preferences-form'} do |f|
   .col-lg-3.profile-settings-sidebar
-    %h3.prepend-top-0
+    %h4.prepend-top-0
       Application theme
     %p
       This setting allows you to customize the appearance of the site, ex. sidebar.
@@ -16,7 +16,7 @@
   .col-sm-12
     %hr
   .col-lg-3.profile-settings-sidebar
-    %h3.prepend-top-0
+    %h4.prepend-top-0
       Syntax highlighting theme
     %p
       This setting allow you to customize the appearance of the syntax.
@@ -29,7 +29,7 @@
   .col-sm-12
     %hr
   .col-lg-3.profile-settings-sidebar
-    %h3.prepend-top-0
+    %h4.prepend-top-0
       Behavior
     %p
       This setting allows you to customize the behavior of the system layout and default views.

app/views/profiles/show.html.haml

-= form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "edit-user prepend-top-default" }, authenticity_token: true do |f|
+-if @user.errors.any?
+  .col-sm-12.alert.alert-danger
+    %ul
+      - @user.errors.full_messages.each do |msg|
+        %li= msg
+= form_for @user, url: profile_path, method: :put, html: { multipart: true, class: "row edit-user prepend-top-default" }, authenticity_token: true do |f|
   = f.hidden_field :avatar_crop_x
   = f.hidden_field :avatar_crop_y
   = f.hidden_field :avatar_crop_size
-  -if @user.errors.any?
-    %div.alert.alert-danger
-      %ul
-        - @user.errors.full_messages.each do |msg|
-          %li= msg
-  .row
-    .col-lg-3.profile-settings-sidebar
-      %h4.prepend-top-0
-        Public Avatar
-      %p
-        - if @user.avatar?
-          You can change your avatar here
-          - if Gitlab.config.gravatar.enabled
-            or remove the current avatar to revert to #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
-        - else
-          You can upload an avatar here
-          - if Gitlab.config.gravatar.enabled
-            or change it at #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
-    .col-lg-9
-      .clearfix.avatar-image.append-bottom-default
-        = image_tag avatar_icon(@user, 160), alt: '', class: 'avatar s160'
-      %h5.prepend-top-0
-        Upload new avatar
-      .prepend-top-5.append-bottom-10
-        %a.btn.js-choose-user-avatar-button
-          Browse file...
-        %span.avatar-file-name.prepend-left-default.js-avatar-filename No file chosen
-        = f.file_field :avatar, class: "js-user-avatar-input hidden"
-      .help-block
-        The maximum file size allowed is 200KB.
+  .col-lg-3.profile-settings-sidebar
+    %h4.prepend-top-0
+      Public Avatar
+    %p
       - if @user.avatar?
-        %hr
-        = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-gray"
-  %hr
-  .row
-    .col-lg-3.profile-settings-sidebar
-      %h4.prepend-top-0
-        Main settings
-      %p
-        This information will appear on your profile.
-        - if current_user.ldap_user?
-          Some options are unavailable for LDAP accounts
-    .col-lg-9
-      .form-group
-        = f.label :name, class: "label-light"
-        = f.text_field :name, class: "form-control", required: true
-        %span.help-block Enter your name, so people you know can recognize you.
-      .form-group
-        = f.label :email, class: "label-light"
-        - if @user.ldap_user? && @user.ldap_email?
-          = f.text_field :email, class: "form-control", required: true, readonly: true
-          %span.help-block.light
-            Your email address was automatically set based on the LDAP server.
+        You can change your avatar here
+        - if Gitlab.config.gravatar.enabled
+          or remove the current avatar to revert to #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
+      - else
+        You can upload an avatar here
+        - if Gitlab.config.gravatar.enabled
+          or change it at #{link_to Gitlab.config.gravatar.host, "http://" + Gitlab.config.gravatar.host}
+  .col-lg-9
+    .clearfix.avatar-image.append-bottom-default
+      = image_tag avatar_icon(@user, 160), alt: '', class: 'avatar s160'
+    %h5.prepend-top-0
+      Upload new avatar
+    .prepend-top-5.append-bottom-10
+      %a.btn.js-choose-user-avatar-button
+        Browse file...
+      %span.avatar-file-name.prepend-left-default.js-avatar-filename No file chosen
+      = f.file_field :avatar, class: "js-user-avatar-input hidden"
+    .help-block
+      The maximum file size allowed is 200KB.
+    - if @user.avatar?
+      %hr
+      = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-gray"
+  .col-sm-12
+    %hr
+  .col-lg-3.profile-settings-sidebar
+    %h4.prepend-top-0
+      Main settings
+    %p
+      This information will appear on your profile.
+      - if current_user.ldap_user?
+        Some options are unavailable for LDAP accounts
+  .col-lg-9
+    .form-group
+      = f.label :name, class: "label-light"
+      = f.text_field :name, class: "form-control", required: true
+      %span.help-block Enter your name, so people you know can recognize you.
+    .form-group
+      = f.label :email, class: "label-light"
+      - if @user.ldap_user? && @user.ldap_email?
+        = f.text_field :email, class: "form-control", required: true, readonly: true
+        %span.help-block.light
+          Your email address was automatically set based on the LDAP server.
+      - else
+        - if @user.temp_oauth_email?
+          = f.text_field :email, class: "form-control", required: true, value: nil
         - else
-          - if @user.temp_oauth_email?
-            = f.text_field :email, class: "form-control", required: true, value: nil
-          - else
-            = f.text_field :email, class: "form-control", required: true
-          - if @user.unconfirmed_email.present?
-            %span.help-block
-              Please click the link in the confirmation email before continuing. It was sent to
-              = succeed "." do
-                %strong #{@user.unconfirmed_email}
-              %p
-              = link_to "Resend confirmation e-mail", user_confirmation_path(user: { email: @user.unconfirmed_email }), method: :post
-          - else
-            %span.help-block We also use email for avatar detection if no avatar is uploaded.
-      .form-group
-        = f.label :public_email, class: "label-light"
-        = f.select :public_email, options_for_select(@user.all_emails, selected: @user.public_email), {include_blank: 'Do not show on profile'}, class: "select2"
-        %span.help-block This email will be displayed on your public profile.
-      .form-group
-        = f.label :skype, class: "label-light"
-        = f.text_field :skype, class: "form-control"
-      .form-group
-        = f.label :linkedin, class: "label-light"
-        = f.text_field :linkedin, class: "form-control"
-      .form-group
-        = f.label :twitter, class: "label-light"
-        = f.text_field :twitter, class: "form-control"
-      .form-group
-        = f.label :website_url, 'Website', class: "label-light"
-        = f.text_field :website_url, class: "form-control"
-      .form-group
-        = f.label :location, 'Location', class: "label-light"
-        = f.text_field :location, class: "form-control"
-      .form-group
-        = f.label :bio, class: "label-light"
-        = f.text_area :bio, rows: 4, class: "form-control", maxlength: 250
-        %span.help-block Tell us about yourself in fewer than 250 characters.
-      .prepend-top-default.append-bottom-default
-        = f.submit 'Update profile settings', class: "btn btn-success"
-        = link_to "Cancel", user_path(current_user), class: "btn btn-cancel"
+          = f.text_field :email, class: "form-control", required: true
+        - if @user.unconfirmed_email.present?
+          %span.help-block
+            Please click the link in the confirmation email before continuing. It was sent to
+            = succeed "." do
+              %strong #{@user.unconfirmed_email}
+            %p
+            = link_to "Resend confirmation e-mail", user_confirmation_path(user: { email: @user.unconfirmed_email }), method: :post
+        - else
+          %span.help-block We also use email for avatar detection if no avatar is uploaded.
+    .form-group
+      = f.label :public_email, class: "label-light"
+      = f.select :public_email, options_for_select(@user.all_emails, selected: @user.public_email), {include_blank: 'Do not show on profile'}, class: "select2"
+      %span.help-block This email will be displayed on your public profile.
+    .form-group
+      = f.label :skype, class: "label-light"
+      = f.text_field :skype, class: "form-control"
+    .form-group
+      = f.label :linkedin, class: "label-light"
+      = f.text_field :linkedin, class: "form-control"
+    .form-group
+      = f.label :twitter, class: "label-light"
+      = f.text_field :twitter, class: "form-control"
+    .form-group
+      = f.label :website_url, 'Website', class: "label-light"
+      = f.text_field :website_url, class: "form-control"
+    .form-group
+      = f.label :location, 'Location', class: "label-light"
+      = f.text_field :location, class: "form-control"
+    .form-group
+      = f.label :bio, class: "label-light"
+      = f.text_area :bio, rows: 4, class: "form-control", maxlength: 250
+      %span.help-block Tell us about yourself in fewer than 250 characters.
+    .prepend-top-default.append-bottom-default
+      = f.submit 'Update profile settings', class: "btn btn-success"
 .modal.modal-profile-crop
   .modal-dialog