Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

6 files changed, 21 insertions, 3 deletions

diff --git a/app/assets/images/gitorious-logo-black.png b/app/assets/images/gitorious-logo-black.png
new file mode 100644
index 00000000000..78f17a9af79
--- /dev/null
+++ b/app/assets/images/gitorious-logo-black.png
diff --git a/app/assets/images/gitorious-logo-blue.png b/app/assets/images/gitorious-logo-blue.png
new file mode 100644
index 00000000000..4962cffba31
--- /dev/null
+++ b/app/assets/images/gitorious-logo-blue.png
diff --git a/app/assets/stylesheets/sections/import.scss b/app/assets/stylesheets/sections/import.scss
new file mode 100644
index 00000000000..3df4bb84bd2
--- /dev/null
+++ b/app/assets/stylesheets/sections/import.scss
@@ -0,0 +1,18 @@
+i.icon-gitorious {
+  display: inline-block;
+  background-position: 0px 0px;
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+
+i.icon-gitorious-small {
+  background-image: image-url('gitorious-logo-blue.png');
+  width: 13px;
+  height: 13px;
+}
+
+i.icon-gitorious-big {
+  background-image: image-url('gitorious-logo-black.png');
+  width: 18px;
+  height: 18px;
+}
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 38341b1c8c6..d1583e6ebfb 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -102,7 +102,7 @@ class ProjectsController < ApplicationController
         flash[:alert] = 'Project deleted.'
 
         if request.referer.include?('/admin')
-          redirect_to admin_namespace_projects_path
+          redirect_to admin_namespaces_projects_path
         else
           redirect_to projects_dashboard_path
         end
diff --git a/app/views/import/gitorious/status.html.haml b/app/views/import/gitorious/status.html.haml
index 35ed0a717de..8ede5c3e840 100644
--- a/app/views/import/gitorious/status.html.haml
+++ b/app/views/import/gitorious/status.html.haml
@@ -1,5 +1,5 @@
 %h3.page-title
-  %i.fa.fa-gitorious
+  %i.icon-gitorious.icon-gitorious-big
   Import repositories from Gitorious.org
 
 %p.light
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 5216f308110..b41d5f52d12 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -71,7 +71,7 @@
         .col-sm-2
         .col-sm-10
           = link_to new_import_gitorious_path do
-            %i.fa.fa-heart
+            %i.icon-gitorious.icon-gitorious-small
             Import projects from Gitorious.org
 
       %hr.prepend-botton-10