diff options
author | Lukas Eipert <leipert@gitlab.com> | 2019-02-06 16:07:04 +0300 |
---|---|---|
committer | Lukas Eipert <leipert@gitlab.com> | 2019-02-07 19:06:24 +0300 |
commit | d4ad8a5e56dc03c2fcd48cc1b054b18f8b347c74 (patch) | |
tree | a8988ad1cea970d513220adb030e8575537c2f93 /app/assets | |
parent | 37410a9ddf2eb90361974fd676bd0558dcad3ffa (diff) |
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.
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/projects/project_new.js | 16 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 9 |
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; } |