diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 46d46368d25..fa9cddef0ad 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -113,6 +113,14 @@ color: $gray-light; } + path { + fill: $gray-light; + } + + svg { + margin-right: 13px; + } + .nav-link-text { margin-top: 3px; font-size: 13px; diff --git a/app/helpers/appearances_helper.rb b/app/helpers/appearances_helper.rb index e0abc3a2869..f240584ccbf 100644 --- a/app/helpers/appearances_helper.rb +++ b/app/helpers/appearances_helper.rb @@ -30,4 +30,8 @@ module AppearancesHelper render 'shared/logo.svg' end end + + def navbar_icon(icon_name) + render "shared/icons/#{icon_name}.svg" + end end diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index df77d9cf83e..30729810687 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -11,6 +11,7 @@ Todos = nav_link(path: 'dashboard#activity') do = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do +<<<<<<< e6daf1f899b412ded9a16674865b09f31fc7c75a = icon('dashboard fw') .nav-link-text Activity @@ -28,6 +29,25 @@ = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do = icon('exclamation-circle fw') .nav-link-text +======= + = navbar_icon('activity') + %span + Activity + = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do + = link_to dashboard_groups_path, title: 'Groups' do + = navbar_icon('group') + %span + Groups + = nav_link(controller: 'dashboard/milestones') do + = link_to dashboard_milestones_path, title: 'Milestones' do + = navbar_icon('milestones') + %span + Milestones + = nav_link(path: 'dashboard#issues') do + = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do + = navbar_icon('issues') + %span +>>>>>>> Start adding SVG icons Issues = nav_link(path: 'dashboard#merge_requests') do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do diff --git a/app/views/shared/icons/_activity.svg b/app/views/shared/icons/_activity.svg new file mode 100644 index 00000000000..69e5afd3a4c --- /dev/null +++ b/app/views/shared/icons/_activity.svg @@ -0,0 +1,18 @@ + + + + Group 5 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/views/shared/icons/_contributionanalytics.svg b/app/views/shared/icons/_contributionanalytics.svg new file mode 100644 index 00000000000..33edf0f9320 --- /dev/null +++ b/app/views/shared/icons/_contributionanalytics.svg @@ -0,0 +1,27 @@ + + + + Pasted Image 234 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/views/shared/icons/_group.svg b/app/views/shared/icons/_group.svg new file mode 100644 index 00000000000..6f2c530c9ba --- /dev/null +++ b/app/views/shared/icons/_group.svg @@ -0,0 +1,42 @@ + + + + Pasted Image 232 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/views/shared/icons/_issues.svg b/app/views/shared/icons/_issues.svg new file mode 100644 index 00000000000..92f48b897b2 --- /dev/null +++ b/app/views/shared/icons/_issues.svg @@ -0,0 +1,38 @@ + + + + Pasted Image 227 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/views/shared/icons/_members.svg b/app/views/shared/icons/_members.svg new file mode 100644 index 00000000000..98635108d0f --- /dev/null +++ b/app/views/shared/icons/_members.svg @@ -0,0 +1,17 @@ + + + + Pasted Image 233 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/app/views/shared/icons/_milestones.svg b/app/views/shared/icons/_milestones.svg new file mode 100644 index 00000000000..f4f5b0c8671 --- /dev/null +++ b/app/views/shared/icons/_milestones.svg @@ -0,0 +1,48 @@ + + + + Pasted Image 226 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/views/shared/icons/_mr.svg b/app/views/shared/icons/_mr.svg new file mode 100644 index 00000000000..c14a5c28163 --- /dev/null +++ b/app/views/shared/icons/_mr.svg @@ -0,0 +1,47 @@ + + + + Pasted Image 228 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file