diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-12 16:37:34 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-12 16:37:34 -0700 |
| commit | 12033330217ce4453ec4427a52ab41801a90feeb (patch) | |
| tree | df77b681bdeedd1d843e0af42dd0231606c05398 | |
| parent | af713ce7ecb477262db88721a3c4421e6bf4e97a (diff) | |
| download | gitlab-ce-remove-extra-space-on-profile.tar.gz | |
Remove extra space on profile page if new nav enabledremove-extra-space-on-profile
| -rw-r--r-- | app/assets/stylesheets/new_sidebar.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/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss index 07b487cd090..d4205d4b1a6 100644 --- a/app/assets/stylesheets/new_sidebar.scss +++ b/app/assets/stylesheets/new_sidebar.scss @@ -186,7 +186,6 @@ $new-sidebar-width: 220px; // Make issue boards full-height now that sub-nav is gone - .boards-list { height: calc(100vh - 50px); @@ -198,6 +197,11 @@ $new-sidebar-width: 220px; } } +// Remove extra top margin on profile page +.new-nav-profile { + margin-top: 0; +} + // Change color of all horizontal tabs to match the new indigo color .nav-links li.active a { diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index f246bd7a586..59b53d880b2 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.layout-nav + .cover-block.user-cover-block.layout-nav{ class: ("new-nav-profile" if show_new_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 |