diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-28 00:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-28 00:09:08 +0300 |
| commit | e49c47d3bc5603e8e9d6ad40fc7fccae9f885843 (patch) | |
| tree | c01f9e16d6bfc242c0b36b8b8b70d4d31a9c0af0 /app/views/users | |
| parent | fbcf5b688d3133065705b24b73330f9b9bf19181 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/show.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index e26b4de7b20..4316b0e4884 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -14,8 +14,8 @@ = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") .user-profile - %div{ class: container_class } - .cover-block.user-cover-block{ class: [('border-bottom' if profile_tabs.empty? || show_super_sidebar?)] } + .cover-block.user-cover-block.gl-border-t.gl-border-b.gl-mt-n1 + %div{ class: container_class } = render layout: 'users/cover_controls' do - if @user == current_user = render Pajamas::ButtonComponent.new(href: profile_path, @@ -46,7 +46,7 @@ = render Pajamas::ButtonComponent.new(variant: :confirm, type: :submit, button_options: { class: 'gl-w-full', data: { qa_selector: 'follow_user_link', track_action: 'click_button', track_label: 'follow_from_profile' } }) do = _('Follow') - .profile-header{ class: [('with-no-profile-tabs' if profile_tabs.empty?)] } + .profile-header{ class: [('with-no-profile-tabs' if profile_tabs.empty?), ('gl-mb-4!' if show_super_sidebar?)] } .gl-display-inline-block.gl-mx-8.gl-vertical-align-top .avatar-holder = link_to avatar_icon_for_user(@user, 400, current_user: current_user), target: '_blank', rel: 'noopener noreferrer' do @@ -129,7 +129,7 @@ .scrolling-tabs-container{ class: [('gl-display-none' if show_super_sidebar?)] } .fade-left= sprite_icon('chevron-lg-left', size: 12) .fade-right= sprite_icon('chevron-lg-right', size: 12) - %ul.nav-links.user-profile-nav.scrolling-tabs.nav.nav-tabs + %ul.nav-links.user-profile-nav.scrolling-tabs.nav.nav-tabs.gl-border-b-0 - if profile_tab?(:overview) %li.js-overview-tab = link_to user_path, data: { target: 'div#js-overview', action: 'overview', toggle: 'tab' } do |