diff options
| author | Harry Kiselev <harry.kiselev@gmail.com> | 2018-11-18 01:12:53 +0300 |
|---|---|---|
| committer | Harry Kiselev <harry.kiselev@gmail.com> | 2018-12-10 12:14:32 +0300 |
| commit | 052622a3d0062796e7e6a8281710cd91e50bd310 (patch) | |
| tree | f311d19bc975227aa06f0143415b1484f3f22a30 | |
| parent | 5618606301cd7ef182b5a658dbabf254e0330f9b (diff) | |
| download | gitlab-ce-052622a3d0062796e7e6a8281710cd91e50bd310.tar.gz | |
Fix profile_header bottom margin, #51807.
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 132f3fea92b..f7a88c5b8c1 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -222,7 +222,7 @@ } .profile-header { - margin: 0 auto; + margin: 0 $gl-padding 10px; .avatar-holder { width: 90px; diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index d11476738e4..d5968fe8181 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -36,7 +36,7 @@ = 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 |