summaryrefslogtreecommitdiff
path: root/app/views/layouts/nav
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-04-01 19:51:18 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-04-01 19:51:18 +0200
commitde6360f9048511f55a9c93e6fc848418cb6c71a5 (patch)
treeef76fa58ccc6f5c27ab3f577b3ca217e858f8677 /app/views/layouts/nav
parent03f2dd90ec5c7d9b2f8d9b6254f7853733302896 (diff)
downloadgitlab-ce-de6360f9048511f55a9c93e6fc848418cb6c71a5.tar.gz
Improve styling for new complex sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/layouts/nav')
-rw-r--r--app/views/layouts/nav/_dashboard.html.haml2
-rw-r--r--app/views/layouts/nav/_group.html.haml10
2 files changed, 2 insertions, 10 deletions
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 866ebfc6f05..dfdabd4c55d 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -15,7 +15,7 @@
= icon('dashboard fw')
%span
Activity
- = nav_link(controller: :groups) do
+ = nav_link(path: ['groups#index']) do
= link_to dashboard_groups_path, title: 'Groups' do
= icon('group fw')
%span
diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml
index 55940741dc0..a03d2c703f7 100644
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
@@ -1,12 +1,4 @@
%ul.nav.nav-sidebar
- = nav_link do
- = link_to root_path, title: 'Go to dashboard', class: 'back-link' do
- = icon('caret-square-o-left fw')
- %span
- Go to dashboard
-
- %li.separate-item
-
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do
= link_to group_path(@group), title: 'Home' do
= icon('group fw')
@@ -42,7 +34,7 @@
%span
Members
- if can?(current_user, :admin_group, @group)
- = nav_link(html_options: { class: "separate-item" }) do
+ = nav_link(html_options: { class: "" }) do
= link_to edit_group_path(@group), title: 'Settings' do
= icon ('cogs fw')
%span