From ed125152c51480a38710b7d2fabcc7ab4ae20acf Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.m.gray@gmail.com>
Date: Mon, 10 Dec 2018 18:32:15 +0000
Subject: Merge branch 'profile-fixing' into 'master'

Fix profile_header bottom margin, #51807.

Closes #51807

See merge request gitlab-org/gitlab-ce!23168
---
 app/assets/stylesheets/pages/profile.scss |  7 +++++--
 app/views/users/show.html.haml            | 12 ++++++------
 changelogs/unreleased/profile-fixing.yml  |  5 +++++
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 changelogs/unreleased/profile-fixing.yml

diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 132f3fea92b..a4831b64344 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -98,7 +98,6 @@
   // Limits the width of the user bio for readability.
   max-width: 600px;
   margin: 10px auto;
-  padding: 0 16px;
 }
 
 .user-avatar-button {
@@ -222,7 +221,11 @@
   }
 
   .profile-header {
-    margin: 0 auto;
+    margin: 0 $gl-padding;
+
+    &.with-no-profile-tabs {
+      margin-bottom: $gl-padding-24;
+    }
 
     .avatar-holder {
       width: 90px;
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index d11476738e4..dd2cd36eac2 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -31,12 +31,12 @@
           data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
           = icon('users')
 
-    .profile-header
+    .profile-header{ class: [('with-no-profile-tabs' if profile_tabs.empty?)] }
       .avatar-holder
         = link_to avatar_icon_for_user(@user, 400), target: '_blank', rel: 'noopener noreferrer' do
           = image_tag avatar_icon_for_user(@user, 90), class: "avatar s90", alt: ''
 
-      .user-info.prepend-left-default.append-right-default
+      .user-info
         .cover-title
           = @user.name
 
@@ -81,10 +81,10 @@
               = icon('briefcase')
               = @user.organization
 
-    - if @user.bio.present?
-      .cover-desc
-        %p.profile-user-bio
-          = @user.bio
+        - if @user.bio.present?
+          .cover-desc
+            %p.profile-user-bio
+              = @user.bio
 
     - unless profile_tabs.empty?
       .scrolling-tabs-container
diff --git a/changelogs/unreleased/profile-fixing.yml b/changelogs/unreleased/profile-fixing.yml
new file mode 100644
index 00000000000..7e255d997d8
--- /dev/null
+++ b/changelogs/unreleased/profile-fixing.yml
@@ -0,0 +1,5 @@
+---
+title: Fix bottom paddings of profile header and some markup updates of profile
+merge_request: 23168
+author: Harry Kiselev
+type: other
-- 
cgit v1.2.1