kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '36821-fix-new-nav-wrapping-caret-and-increasing-height' into 'master'

Browse source 
Fix new navigation wrapping caret and increasing height

Closes #36821

See merge request !13967
This commit is contained in:
Annabel Dunstone Gray 2017-09-05 15:09:59 +00:00
commit b5a06c6099
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/layouts/nav/_new_dashboard.html.haml
View file

@ -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

5
changelogs/unreleased/36821-fix-new-nav-wrapping-caret-and-increasing-height.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix new navigation wrapping and causing height to grow
merge_request:
author:
type: fixed