summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-01-08 19:08:17 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-01-08 19:08:17 +0000
commitd76747413932c7af932e168d6f6291110f2a16e0 (patch)
tree4598f62ae2f5e5a22ca8a21d5be5b666956a8000
parent1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff)
parent4963f39141208b91be52f7ae6dbdc2d885b4db3c (diff)
downloadgitlab-ce-d76747413932c7af932e168d6f6291110f2a16e0.tar.gz
Merge branch 'fix/dashboard-projects-nav-links-height' into 'master'
Fix dashboard projects nav links height See merge request gitlab-org/gitlab-ce!16204
-rw-r--r--app/views/dashboard/projects/_nav.html.haml2
-rw-r--r--changelogs/unreleased/fix-dashboard-projects-nav-links-height.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/dashboard/projects/_nav.html.haml b/app/views/dashboard/projects/_nav.html.haml
index 3701e1c0578..c18077bc66f 100644
--- a/app/views/dashboard/projects/_nav.html.haml
+++ b/app/views/dashboard/projects/_nav.html.haml
@@ -1,4 +1,4 @@
-.top-area
+.nav-block
%ul.nav-links
= nav_link(html_options: { class: ("active" unless params[:personal].present?) }) do
= link_to s_('DashboardProjects|All'), dashboard_projects_path
diff --git a/changelogs/unreleased/fix-dashboard-projects-nav-links-height.yml b/changelogs/unreleased/fix-dashboard-projects-nav-links-height.yml
new file mode 100644
index 00000000000..2f6a07bb234
--- /dev/null
+++ b/changelogs/unreleased/fix-dashboard-projects-nav-links-height.yml
@@ -0,0 +1,5 @@
+---
+title: Fix dashboard projects nav links height
+merge_request: 16204
+author: George Tsiolis
+type: fixed