Project template: Fall back to GitLab logo

Use gitlab-svg to provide the icons for rails, spring and express. For
the new GitLab pages templates, we are falling back to the GitLab logo.

2 files changed, 9 insertions, 16 deletions

diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js
index 9ca1a26b3ac..d65e73a3f9c 100644
--- a/app/assets/javascripts/projects/project_new.js
+++ b/app/assets/javascripts/projects/project_new.js
@@ -115,35 +115,35 @@ const bindEvents = () => {
     const templates = {
       rails: {
         text: 'Ruby on Rails',
-        icon: '.template-option svg.icon-rails',
+        icon: '.template-option .icon-rails',
       },
       express: {
         text: 'NodeJS Express',
-        icon: '.template-option svg.icon-node-express',
+        icon: '.template-option .icon-express',
       },
       spring: {
         text: 'Spring',
-        icon: '.template-option svg.icon-java-spring',
+        icon: '.template-option .icon-spring',
       },
       hugo: {
         text: 'Pages/Hugo',
-        icon: '.template-option svg.icon-pages-hugo',
+        icon: '.template-option .icon-hugo',
       },
       jekyll: {
         text: 'Pages/Jekyll',
-        icon: '.template-option svg.icon-pages-jekyll',
+        icon: '.template-option .icon-jekyll',
       },
       plainhtml: {
         text: 'Pages/Plain HTML',
-        icon: '.template-option svg.icon-pages-plainhtml',
+        icon: '.template-option .icon-plainhtml',
       },
       gitbook: {
         text: 'Pages/GitBook',
-        icon: '.template-option svg.icon-pages-gitbook',
+        icon: '.template-option .icon-gitbook',
       },
       hexo: {
         text: 'Pages/Hexo',
-        icon: '.template-option svg.icon-pages-hexo',
+        icon: '.template-option .icon-hexo',
       },
     };
 
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 3eb02cd4358..66866aedfba 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -507,12 +507,6 @@
   }
 
   .template-option {
-    .logo {
-      .btn-template-icon {
-        width: 40px !important;
-      }
-    }
-
     padding: 16px 0;
 
     &:not(:first-child) {
@@ -551,9 +545,8 @@
     }
 
     .selected-icon {
-      svg {
+      img {
         display: none;
-        top: 7px;
         height: 20px;
         width: 20px;
       }