summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jvargas@gitlab.com>2018-06-11 11:21:10 -0500
committerJose <jvargas@gitlab.com>2018-06-13 12:41:12 -0500
commit91f31ae519b500b5d7db8a4f31bda8482aadae26 (patch)
treef7105b4d95653027caef1f6c2f4cd2564293f2cc
parent7b7ba297cf64f4e5ea27234600c038c3b2fc0a6d (diff)
downloadgitlab-ce-91f31ae519b500b5d7db8a4f31bda8482aadae26.tar.gz
Fix use template buttons for creating a new project
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss4
-rw-r--r--app/views/projects/_project_templates.html.haml23
2 files changed, 16 insertions, 11 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 810ed5bb0a6..95b842a337c 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -293,3 +293,7 @@ input[type=color].form-control {
color: $gl-text-color-secondary;
}
}
+
+.btn {
+ margin-bottom: 0;
+}
diff --git a/app/views/projects/_project_templates.html.haml b/app/views/projects/_project_templates.html.haml
index 9d27f51926e..1dd434d4c35 100644
--- a/app/views/projects/_project_templates.html.haml
+++ b/app/views/projects/_project_templates.html.haml
@@ -10,16 +10,17 @@
%a.btn.btn-default{ href: template.preview, rel: 'noopener noreferrer', target: '_blank' } Preview
.project-fields-form
- .form-group
- %label.label-light
- Template
- .input-group.template-input-group
- .input-group-prepend
- .input-group-text
- .selected-icon
- - Gitlab::ProjectTemplate.all.each do |template|
- = custom_icon(template.logo)
- .selected-template
- %button.btn.btn-default.change-template{ type: "button" } Change template
+ .row
+ .form-group.col-sm-12
+ %label.label-light
+ Template
+ .input-group.template-input-group
+ .input-group-prepend
+ .input-group-text
+ .selected-icon
+ - Gitlab::ProjectTemplate.all.each do |template|
+ = custom_icon(template.logo)
+ .selected-template
+ %button.btn.btn-default.change-template{ type: "button" } Change template
= render 'new_project_fields', f: f, project_name_id: "template-project-name"