diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-18 13:24:14 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-18 13:24:14 +0000 |
| commit | 4e410a6e5100d76529e66bb23c4496b14d24f4af (patch) | |
| tree | 9308214841579916f48e1d2612d0f9bce2464ef1 | |
| parent | 72119e7f38d5c50d2f1333adfedd6922d3e65ad1 (diff) | |
| parent | 5cd7cd4704cb7db5f8cb5a6e084c4e502c053a85 (diff) | |
| download | gitlab-ce-4e410a6e5100d76529e66bb23c4496b14d24f4af.tar.gz | |
Merge branch '32465-center' into 'master'
recenter profile page nav links
Closes #32465
See merge request !11464
| -rw-r--r-- | app/views/users/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 8e8b84e0408..2b70d70e360 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -10,7 +10,7 @@ = auto_discovery_link_tag(:atom, user_url(@user, format: :atom), title: "#{@user.name} activity") .user-profile - .cover-block.user-cover-block + .cover-block.user-cover-block.layout-nav .cover-controls - if @user == current_user = link_to profile_path, class: 'btn btn-gray has-tooltip', title: 'Edit profile', 'aria-label': 'Edit profile' do @@ -82,7 +82,7 @@ .scrolling-tabs-container .fade-left= icon('angle-left') .fade-right= icon('angle-right') - %ul.nav-links.center.user-profile-nav.scrolling-tabs + %ul.nav-links.user-profile-nav.scrolling-tabs %li.js-activity-tab = link_to user_path, data: { target: 'div#activity', action: 'activity', toggle: 'tab' } do Activity |