From 37410a9ddf2eb90361974fd676bd0558dcad3ffa Mon Sep 17 00:00:00 2001 From: Jason Lenny Date: Tue, 29 Jan 2019 08:25:52 +0000 Subject: Add Pages templates Adds templates for the 5 most popular Pages templates to the new project menu. This does not add unique icons for the templates because that turned out more complicated than expected, and this feature is valuable without them. --- app/views/projects/new.html.haml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/views') diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 8275996b522..ff7c36c2d5b 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -16,6 +16,9 @@ = _('A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}.').html_safe % { among_other_things_link: among_other_things_link } %p = _('All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings.') + %p + - pages_getting_started_guide = link_to _('Pages getting started guide'), help_page_path("user/project/pages/getting_started_part_two", anchor: "fork-a-project-to-get-started-from"), target: '_blank' + = _('Information about additional Pages templates and how to install them can be found in our %{pages_getting_started_guide}.').html_safe % { pages_getting_started_guide: pages_getting_started_guide } .md = brand_new_project_guidelines %p -- cgit v1.2.3 From d4ad8a5e56dc03c2fcd48cc1b054b18f8b347c74 Mon Sep 17 00:00:00 2001 From: Lukas Eipert Date: Wed, 6 Feb 2019 14:07:04 +0100 Subject: 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. --- app/views/projects/project_templates/_built_in_templates.html.haml | 4 ++-- app/views/shared/icons/_express.svg | 1 - app/views/shared/icons/_rails.svg | 1 - app/views/shared/icons/_spring.svg | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 app/views/shared/icons/_express.svg delete mode 100644 app/views/shared/icons/_rails.svg delete mode 100644 app/views/shared/icons/_spring.svg (limited to 'app/views') diff --git a/app/views/projects/project_templates/_built_in_templates.html.haml b/app/views/projects/project_templates/_built_in_templates.html.haml index 2a0ce4bd16b..6159f1c3542 100644 --- a/app/views/projects/project_templates/_built_in_templates.html.haml +++ b/app/views/projects/project_templates/_built_in_templates.html.haml @@ -1,7 +1,7 @@ - Gitlab::ProjectTemplate.all.each do |template| .template-option.d-flex.align-items-center - .logo.append-right-10 - = custom_icon(template.logo, size: 40) + .logo.append-right-10.px-1 + = image_tag template.logo, size: 32, class: "btn-template-icon icon-#{template.name}" .description %strong = template.title diff --git a/app/views/shared/icons/_express.svg b/app/views/shared/icons/_express.svg deleted file mode 100644 index a51e81e5568..00000000000 --- a/app/views/shared/icons/_express.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/views/shared/icons/_rails.svg b/app/views/shared/icons/_rails.svg deleted file mode 100644 index 852bd183cc7..00000000000 --- a/app/views/shared/icons/_rails.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app/views/shared/icons/_spring.svg b/app/views/shared/icons/_spring.svg deleted file mode 100644 index ccf18749029..00000000000 --- a/app/views/shared/icons/_spring.svg +++ /dev/null @@ -1 +0,0 @@ - -- cgit v1.2.3