Commit 4281daf3 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Update links in side nav and header

parent aba94f65
...@@ -21,57 +21,66 @@ ...@@ -21,57 +21,66 @@
background: $color-darker; background: $color-darker;
} }
.nav-sidebar li { .sidebar-header,
a { .sidebar-action-buttons {
color: $color-light; color: $color-light;
background-color: lighten($color-darker, 5%);
&:hover, }
&:focus,
&:active {
background: $color-dark;
}
i { .nav-sidebar {
li {
a {
color: $color-light; color: $color-light;
}
path,
polygon {
fill: $color-light;
}
.count { &:hover,
color: $color-light; &:focus,
background: $color-dark; &:active {
background: $color-dark;
}
i {
color: $color-light;
}
path,
polygon {
fill: $color-light;
}
.count {
color: $color-light;
background: $color-dark;
}
svg {
position: relative;
top: 3px;
}
} }
svg { &.separate-item {
position: relative; border-top: 1px solid $color;
top: 3px;
} }
}
&.separate-item {
border-top: 1px solid $color;
}
&.active a { &.active a {
color: $white-light; color: $white-light;
background: $color-dark; background: $color-dark;
&.no-highlight { &.no-highlight {
border: none; border: none;
} }
i { i {
color: $white-light; color: $white-light;
} }
path, path,
polygon { polygon {
fill: $white-light; fill: $white-light;
}
} }
} }
} }
} }
} }
......
...@@ -49,12 +49,16 @@ header { ...@@ -49,12 +49,16 @@ header {
font-size: 18px; font-size: 18px;
padding: 0; padding: 0;
margin: ($header-height - 28) / 2 0; margin: ($header-height - 28) / 2 0;
margin-left: 10px; margin-left: 8px;
height: 28px; height: 28px;
min-width: 28px; min-width: 28px;
line-height: 28px; line-height: 28px;
text-align: center; text-align: center;
&.header-user-dropdown-toggle {
margin-left: 14px;
}
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
......
...@@ -59,6 +59,11 @@ ...@@ -59,6 +59,11 @@
padding: 0 !important; padding: 0 !important;
} }
.sidebar-header {
padding: 11px 22px 12px;
font-size: 20px;
}
li { li {
&.separate-item { &.separate-item {
padding-top: 10px; padding-top: 10px;
......
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
= icon('bell fw') = icon('bell fw')
%span.badge.todos-pending-count{ class: ("hidden" if todos_pending_count == 0) } %span.badge.todos-pending-count{ class: ("hidden" if todos_pending_count == 0) }
= todos_pending_count = todos_pending_count
- if current_user.can_create_project?
%li
= link_to new_project_path, title: 'New project', aria: { label: "New project" }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= icon('plus fw')
- if Gitlab::Sherlock.enabled? - if Gitlab::Sherlock.enabled?
%li %li
= link_to sherlock_transactions_path, title: 'Sherlock Transactions', = link_to sherlock_transactions_path, title: 'Sherlock Transactions',
...@@ -48,6 +44,8 @@ ...@@ -48,6 +44,8 @@
= link_to "Profile", current_user, class: 'profile-link', aria: { label: "Profile" }, data: { user: current_user.username } = link_to "Profile", current_user, class: 'profile-link', aria: { label: "Profile" }, data: { user: current_user.username }
%li %li
= link_to "Profile Settings", profile_path, aria: { label: "Profile Settings" } = link_to "Profile Settings", profile_path, aria: { label: "Profile Settings" }
%li
= link_to "Help", help_path, aria: { label: "Help" }
%li.divider %li.divider
%li %li
= link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link", aria: { label: "Sign out" } = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link", aria: { label: "Sign out" }
......
%ul.nav.nav-sidebar .nav-sidebar
= nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do .sidebar-header Across GitLab
= link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do %ul.nav
%span = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do
Projects = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do
= nav_link(controller: :todos) do
= link_to dashboard_todos_path, title: 'Todos' do
%span
Todos
%span.count.js-todos-count= number_with_delimiter(todos_pending_count)
= nav_link(path: 'dashboard#activity') do
= link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
%span
Activity
- if koding_enabled?
= nav_link(controller: :koding) do
= link_to koding_path, title: 'Koding' do
%span %span
Koding Projects
= nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do = nav_link(path: 'dashboard#activity') do
= link_to dashboard_groups_path, title: 'Groups' do = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do
%span %span
Groups Activity
= nav_link(controller: 'dashboard/milestones') do - if koding_enabled?
= link_to dashboard_milestones_path, title: 'Milestones' do = nav_link(controller: :koding) do
%span = link_to koding_path, title: 'Koding' do
Milestones %span
= nav_link(path: 'dashboard#issues') do Koding
= link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do
%span = link_to dashboard_groups_path, title: 'Groups' do
Issues %span
%span.count= number_with_delimiter(current_user.assigned_issues.opened.count) Groups
= nav_link(path: 'dashboard#merge_requests') do = nav_link(controller: 'dashboard/milestones') do
= link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do = link_to dashboard_milestones_path, title: 'Milestones' do
%span %span
Merge Requests Milestones
%span.count= number_with_delimiter(current_user.assigned_merge_requests.opened.count) = nav_link(path: 'dashboard#issues') do
= nav_link(controller: 'dashboard/snippets') do = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do
= link_to dashboard_snippets_path, title: 'Snippets' do %span
%span Issues
Snippets %span.count= number_with_delimiter(current_user.assigned_issues.opened.count)
= nav_link(controller: :help) do = nav_link(path: 'dashboard#merge_requests') do
= link_to help_path, title: 'Help' do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do
%span %span
Help Merge Requests
= nav_link(html_options: {class: profile_tab_class}) do %span.count= number_with_delimiter(current_user.assigned_merge_requests.opened.count)
= link_to profile_path, title: 'Profile Settings', data: {placement: 'bottom'} do = nav_link(controller: 'dashboard/snippets') do
%span = link_to dashboard_snippets_path, title: 'Snippets' do
Profile Settings %span
Snippets
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