4 files changed, 40 insertions, 27 deletions
diff --git a/app/views/layouts/nav/_snippets.html.haml b/app/views/layouts/nav/_snippets.html.haml
new file mode 100644
index 00000000000..1c5d376a76d
--- /dev/null
+++ b/app/views/layouts/nav/_snippets.html.haml
@@ -0,0 +1,11 @@
+%ul.nav.nav-sidebar
+  = nav_link(path: user_snippets_path(current_user), html_options: {class: 'home'}) do
+    = link_to user_snippets_path(current_user) do
+      %i.fa.fa-dashboard
+      %span
+        My Snippets
+  = nav_link(path: snippets_path) do
+    = link_to snippets_path, title: 'Discover snippets' do
+      %i.fa.fa-globe
+      %span
+        Discover Snippets
diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml
new file mode 100644
index 00000000000..fbd29eb23a7
--- /dev/null
+++ b/app/views/layouts/snippets.html.haml
@@ -0,0 +1,6 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head", title: "Dashboard"
+  %body{class: "#{app_theme}  application", :'data-page' => body_data_page }
+    = render "layouts/head_panel", title: link_to("Snippets", snippets_path)
+    = render 'layouts/page', sidebar: 'layouts/nav/snippets'
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index 0df5ade500d..4a273557953 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -8,32 +8,29 @@
 
 %p.light
   Share code pastes with others out of git repository
-%hr
 
-.row
-  .col-md-3
-    %ul.nav.nav-pills.nav-stacked
-      = nav_tab :scope, nil do
-        = link_to user_snippets_path(@user) do
-          All
-          %span.pull-right
-            = @user.snippets.count
-      = nav_tab :scope, 'are_private' do
-        = link_to user_snippets_path(@user, scope: 'are_private') do
-          Private
-          %span.pull-right
-            = @user.snippets.are_private.count
-      = nav_tab :scope, 'are_internal' do
-        = link_to user_snippets_path(@user, scope: 'are_internal') do
-          Internal
-          %span.pull-right
-            = @user.snippets.are_internal.count
-      = nav_tab :scope, 'are_public' do
-        = link_to user_snippets_path(@user, scope: 'are_public') do
-          Public
-          %span.pull-right
-            = @user.snippets.are_public.count
+%ul.nav.nav-tabs
+  = nav_tab :scope, nil do
+    = link_to user_snippets_path(@user) do
+      All
+      %span.badge
+        = @user.snippets.count
+  = nav_tab :scope, 'are_private' do
+    = link_to user_snippets_path(@user, scope: 'are_private') do
+      Private
+      %span.badge
+        = @user.snippets.are_private.count
+  = nav_tab :scope, 'are_internal' do
+    = link_to user_snippets_path(@user, scope: 'are_internal') do
+      Internal
+      %span.badge
+        = @user.snippets.are_internal.count
+  = nav_tab :scope, 'are_public' do
+    = link_to user_snippets_path(@user, scope: 'are_public') do
+      Public
+      %span.badge
+        = @user.snippets.are_public.count
 
-  .col-md-9.my-snippets
-    = render 'snippets'
+.my-snippets
+  = render 'snippets'
 
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index 5cd8ae26cf9..108dd0cca3e 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -2,7 +2,6 @@
   Public snippets
 
   .pull-right
-
     - if current_user
       = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
         Add new snippet