diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-05 15:09:59 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-05 15:09:59 +0000 |
| commit | b5a06c609915a5321a5f35b7915dbb6744a54285 (patch) | |
| tree | db10d7d5e9d17cbc45b65587858d3349ae62fb13 | |
| parent | 8813089a6477090e2a9422c20432756c96d527be (diff) | |
| parent | 7d52f29b9b563f6a45e9670db6f95bc3459f4a68 (diff) | |
| download | gitlab-ce-b5a06c609915a5321a5f35b7915dbb6744a54285.tar.gz | |
Merge branch '36821-fix-new-nav-wrapping-caret-and-increasing-height' into 'master'
Fix new navigation wrapping caret and increasing height
Closes #36821
See merge request !13967
| -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 88d164cac32..e670e04928c 100644 --- a/app/views/layouts/nav/_new_dashboard.html.haml +++ b/app/views/layouts/nav/_new_dashboard.html.haml @@ -10,7 +10,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 @@ -20,7 +20,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 |