Merge branch 'master' into rails-4.1.9

Conflicts:
	app/views/dashboard/projects.html.haml

3 files changed, 6 insertions, 7 deletions

diff --git a/app/views/dashboard/_projects_filter.html.haml b/app/views/dashboard/_projects_filter.html.haml
index 7b5d46072e3..d87ca861aed 100644
--- a/app/views/dashboard/_projects_filter.html.haml
+++ b/app/views/dashboard/_projects_filter.html.haml
@@ -1,6 +1,6 @@
 .dash-projects-filters.append-bottom-20
-  .pull-left.append-right-20
-    %ul.nav.nav-pills.nav-compact
+  .append-right-20
+    %ul.nav.nav-tabs
       = nav_tab :scope, nil do
         = link_to projects_dashboard_filter_path(scope: nil) do
           All
diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml
index 1cea654dc1e..e57e1e0939e 100644
--- a/app/views/dashboard/projects.html.haml
+++ b/app/views/dashboard/projects.html.haml
@@ -20,7 +20,7 @@
           .project-access-icon
             = visibility_level_icon(project.visibility_level)
           = link_to namespace_project_path(project.namespace, project), class: dom_class(project) do
-            = project.name_with_namespace
+            %strong= project.name_with_namespace
 
           - if project.forked_from_project
              
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index 10951af6a09..f973f4829a0 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -2,11 +2,10 @@
   .dashboard.row
     %section.activities.col-md-8
       = render 'activities'
-    %aside.side.col-md-4.left.responsive-side
+    %aside.col-md-4
       = render 'sidebar'
-
-  .fixed.sidebar-expand-button.hidden-lg.hidden-md
-    %i.fa.fa-list.fa-2x
+    = link_to '#aside', class: 'show-aside' do
+      %i.fa.fa-angle-left
 
 - else
   = render "zero_authorized_projects"