Commit 81ec6b55 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'profile-fixing' into 'master'

Fix profile_header bottom margin, #51807.

Closes #51807

See merge request gitlab-org/gitlab-ce!23168
parents ce51662e 5ddbe836
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
// Limits the width of the user bio for readability. // Limits the width of the user bio for readability.
max-width: 600px; max-width: 600px;
margin: 10px auto; margin: 10px auto;
padding: 0 16px;
} }
.user-avatar-button { .user-avatar-button {
...@@ -222,7 +221,11 @@ ...@@ -222,7 +221,11 @@
} }
.profile-header { .profile-header {
margin: 0 auto; margin: 0 $gl-padding;
&.with-no-profile-tabs {
margin-bottom: $gl-padding-24;
}
.avatar-holder { .avatar-holder {
width: 90px; width: 90px;
......
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('users') = icon('users')
.profile-header .profile-header{ class: [('with-no-profile-tabs' if profile_tabs.empty?)] }
.avatar-holder .avatar-holder
= link_to avatar_icon_for_user(@user, 400), target: '_blank', rel: 'noopener noreferrer' do = 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: '' = image_tag avatar_icon_for_user(@user, 90), class: "avatar s90", alt: ''
.user-info.prepend-left-default.append-right-default .user-info
.cover-title .cover-title
= @user.name = @user.name
...@@ -81,10 +81,10 @@ ...@@ -81,10 +81,10 @@
= icon('briefcase') = icon('briefcase')
= @user.organization = @user.organization
- if @user.bio.present? - if @user.bio.present?
.cover-desc .cover-desc
%p.profile-user-bio %p.profile-user-bio
= @user.bio = @user.bio
- unless profile_tabs.empty? - unless profile_tabs.empty?
.scrolling-tabs-container .scrolling-tabs-container
......
---
title: Fix bottom paddings of profile header and some markup updates of profile
merge_request: 23168
author: Harry Kiselev
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment