diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-28 09:52:11 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-28 09:59:29 -0500 |
| commit | 646feca6d72b75d92e1a4db6c7ebc6b0d5bc9be4 (patch) | |
| tree | 674b6c576294fc963b91514bedbf3680fb9d48c3 /app/views | |
| parent | ef722faa955a755b2a73efbacdc8a2ca17e399b2 (diff) | |
| download | gitlab-ce-646feca6d72b75d92e1a4db6c7ebc6b0d5bc9be4.tar.gz | |
Make header into links; CSS tweaks
Diffstat (limited to 'app/views')
4 files changed, 6 insertions, 6 deletions
diff --git a/app/views/layouts/nav/_new_admin_sidebar.html.haml b/app/views/layouts/nav/_new_admin_sidebar.html.haml index 3f05ae67010..c9415469912 100644 --- a/app/views/layouts/nav/_new_admin_sidebar.html.haml +++ b/app/views/layouts/nav/_new_admin_sidebar.html.haml @@ -1,5 +1,5 @@ .nav-sidebar - .context-header + = link_to admin_root_path, title: 'Overview', class: 'context-header' do .avatar-container.s40.settings-avatar = icon('wrench') .project-title Admin Area diff --git a/app/views/layouts/nav/_new_group_sidebar.html.haml b/app/views/layouts/nav/_new_group_sidebar.html.haml index 8eab32a6391..7720918be54 100644 --- a/app/views/layouts/nav/_new_group_sidebar.html.haml +++ b/app/views/layouts/nav/_new_group_sidebar.html.haml @@ -1,5 +1,5 @@ .nav-sidebar - .context-header + = link_to group_path(@group), title: 'Home', class: 'context-header' do .avatar-container.s40.group-avatar = image_tag group_icon(@group), class: "avatar s40 avatar-tile" .group-title diff --git a/app/views/layouts/nav/_new_profile_sidebar.html.haml b/app/views/layouts/nav/_new_profile_sidebar.html.haml index 465bad1de21..033ea149cfb 100644 --- a/app/views/layouts/nav/_new_profile_sidebar.html.haml +++ b/app/views/layouts/nav/_new_profile_sidebar.html.haml @@ -1,8 +1,8 @@ .nav-sidebar - .context-header + = link_to profile_path, title: 'Profile Settings', class: 'context-header' do .avatar-container.s40.settings-avatar - = icon('wrench') - .project-title Settings + = icon('user') + .project-title User Settings %ul.sidebar-top-level-items = nav_link(path: 'profiles#show', html_options: {class: 'home'}) do = link_to profile_path, title: 'Profile Settings' do diff --git a/app/views/layouts/nav/_new_project_sidebar.html.haml b/app/views/layouts/nav/_new_project_sidebar.html.haml index de0f4e3d2bc..eae9da5da14 100644 --- a/app/views/layouts/nav/_new_project_sidebar.html.haml +++ b/app/views/layouts/nav/_new_project_sidebar.html.haml @@ -1,6 +1,6 @@ .nav-sidebar - can_edit = can?(current_user, :admin_project, @project) - .context-header + = link_to project_path(@project), title: 'Project', class: 'context-header' do .avatar-container.s40.project-avatar = project_icon(@project, alt: @project.name, class: 'avatar s40 avatar-tile') .project-title |