Commit b5a06c60 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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
parents 8813089a 7d52f29b
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
= link_to dashboard_groups_path, class: 'dashboard-shortcuts-groups', title: 'Groups' do = link_to dashboard_groups_path, class: 'dashboard-shortcuts-groups', title: 'Groups' do
Groups 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 = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
Activity Activity
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
= icon("chevron-down", class: "dropdown-chevron") = icon("chevron-down", class: "dropdown-chevron")
.dropdown-menu .dropdown-menu
%ul %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 = link_to activity_dashboard_path, title: 'Activity' do
Activity Activity
......
---
title: Fix new navigation wrapping and causing height to grow
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment