diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-08-31 14:12:32 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-08-31 14:33:03 -0500 |
| commit | 7d52f29b9b563f6a45e9670db6f95bc3459f4a68 (patch) | |
| tree | 505be9dae5010f7e09b0842ea912859103ba90d2 | |
| parent | 9aef0427eb9986fc27a399ea6b47e1518d6ebdac (diff) | |
| download | gitlab-ce-36821-fix-new-nav-wrapping-caret-and-increasing-height.tar.gz | |
Fix new nav wrapping caret and increasing height36821-fix-new-nav-wrapping-caret-and-increasing-height
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/36821
| -rw-r--r-- | app/views/layouts/nav/_new_dashboard.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/36821-fix-new-nav-wrapping-caret-and-increasing-height.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/layouts/nav/_new_dashboard.html.haml b/app/views/layouts/nav/_new_dashboard.html.haml index cfdfcbebc9f..f9f557518d3 100644 --- a/app/views/layouts/nav/_new_dashboard.html.haml +++ b/app/views/layouts/nav/_new_dashboard.html.haml @@ -7,7 +7,7 @@ = link_to dashboard_groups_path, class: 'dashboard-shortcuts-groups', title: 'Groups' do Groups - = nav_link(path: 'dashboard#activity', html_options: { class: "hidden-xs hidden-sm" }) do + = nav_link(path: 'dashboard#activity', html_options: { class: "hidden-xs hidden-sm hidden-md" }) do = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do Activity @@ -17,7 +17,7 @@ = icon("chevron-down", class: "dropdown-chevron") .dropdown-menu %ul - = nav_link(path: 'dashboard#activity', html_options: { class: "visible-xs visible-sm" }) do + = nav_link(path: 'dashboard#activity', html_options: { class: "visible-xs visible-sm visible-md" }) do = link_to activity_dashboard_path, title: 'Activity' do Activity diff --git a/changelogs/unreleased/36821-fix-new-nav-wrapping-caret-and-increasing-height.yml b/changelogs/unreleased/36821-fix-new-nav-wrapping-caret-and-increasing-height.yml new file mode 100644 index 00000000000..54c7a8c8788 --- /dev/null +++ b/changelogs/unreleased/36821-fix-new-nav-wrapping-caret-and-increasing-height.yml @@ -0,0 +1,5 @@ +--- +title: Fix new navigation wrapping and causing height to grow +merge_request: +author: +type: fixed |