diff options
| author | Harry Kiselev <harry.kiselev@gmail.com> | 2018-12-10 10:57:38 +0300 |
|---|---|---|
| committer | Harry Kiselev <harry.kiselev@gmail.com> | 2018-12-10 12:14:32 +0300 |
| commit | 5ddbe8361942f406b2935d73a7b25674d7e7579f (patch) | |
| tree | 0999a75067e7ce282420d2028b5356d8382dcd0d | |
| parent | 95491f398772e5f84af08ae97be3071dbba7377f (diff) | |
| download | gitlab-ce-5ddbe8361942f406b2935d73a7b25674d7e7579f.tar.gz | |
Add bottom margin depends on profile tabs visibility.
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 6 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 6b16720febd..a4831b64344 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -221,7 +221,11 @@ } .profile-header { - margin: 0 $gl-padding 10px; + 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 d5968fe8181..dd2cd36eac2 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -31,7 +31,7 @@ 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: '' |