From 91f31ae519b500b5d7db8a4f31bda8482aadae26 Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 11 Jun 2018 11:21:10 -0500 Subject: Fix use template buttons for creating a new project --- app/assets/stylesheets/bootstrap_migration.scss | 4 ++++ app/views/projects/_project_templates.html.haml | 23 ++++++++++++----------- 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" -- cgit v1.2.1 From 9e63168282d8234f1c9212fb6b514474ba2df9d0 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Mon, 11 Jun 2018 17:18:19 -0500 Subject: Fix change template form --- app/assets/stylesheets/bootstrap_migration.scss | 4 ++++ app/assets/stylesheets/pages/projects.scss | 25 ++++++------------------- app/views/projects/_project_templates.html.haml | 3 ++- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 95b842a337c..191a3bb5b59 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -161,6 +161,10 @@ table { } } +.input-group-prepend svg.active { + border: 0 !important; +} + // Polyfill deprecated selectors .hidden { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index caafda5fb05..ea2c0a86e49 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -514,12 +514,6 @@ } } - svg { - position: absolute; - left: $gl-padding; - top: $gl-padding; - } - .project-fields-form { display: none; @@ -530,25 +524,18 @@ } .template-input-group { - position: relative; - - @include media-breakpoint-up(sm) { - display: flex; - } - - .input-group-prepend, - .input-group-append { + .input-group-prepend { flex: 1; - text-align: left; - padding-left: ($gl-padding * 3); - background-color: $white-light; } - .selected-template { - line-height: 20px; + .input-group-text { + width: 100%; + background-color: $white-light; } .selected-icon { + padding-right: $gl-padding; + svg { display: none; top: 7px; diff --git a/app/views/projects/_project_templates.html.haml b/app/views/projects/_project_templates.html.haml index 1dd434d4c35..d08807b5135 100644 --- a/app/views/projects/_project_templates.html.haml +++ b/app/views/projects/_project_templates.html.haml @@ -21,6 +21,7 @@ - Gitlab::ProjectTemplate.all.each do |template| = custom_icon(template.logo) .selected-template - %button.btn.btn-default.change-template{ type: "button" } Change template + .input-group-append + %button.btn.btn-default.change-template{ type: "button" } Change template = render 'new_project_fields', f: f, project_name_id: "template-project-name" -- cgit v1.2.1 From 32757d6455a4809ad2ad9537f62d8f3ac03099e5 Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Tue, 12 Jun 2018 16:06:00 -0500 Subject: Use d-block --- app/assets/javascripts/projects/project_new.js | 4 ++-- app/assets/stylesheets/bootstrap_migration.scss | 4 ---- app/assets/stylesheets/pages/projects.scss | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 888b1d6ce33..002edb4663c 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -90,7 +90,7 @@ const bindEvents = () => { function chooseTemplate() { $('.template-option').hide(); $projectFieldsForm.addClass('selected'); - $selectedIcon.removeClass('active'); + $selectedIcon.removeClass('d-block'); const value = $(this).val(); const templates = { rails: { @@ -109,7 +109,7 @@ const bindEvents = () => { const selectedTemplate = templates[value]; $selectedTemplateText.text(selectedTemplate.text); - $(selectedTemplate.icon).addClass('active'); + $(selectedTemplate.icon).addClass('d-block'); $templateProjectNameInput.focus(); } diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 191a3bb5b59..95b842a337c 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -161,10 +161,6 @@ table { } } -.input-group-prepend svg.active { - border: 0 !important; -} - // Polyfill deprecated selectors .hidden { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index ea2c0a86e49..3a495af58dc 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -541,10 +541,6 @@ top: 7px; height: 20px; width: 20px; - - &.active { - display: block; - } } } } -- cgit v1.2.1 From f69101ff4eb87c1412fa27c600545e1a74946f9c Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 13 Jun 2018 12:41:44 -0500 Subject: Remove vertical-alignment from project template buttons --- app/assets/stylesheets/bootstrap_migration.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 95b842a337c..5da0e672288 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -294,6 +294,8 @@ input[type=color].form-control { } } -.btn { - margin-bottom: 0; +.project-templates-buttons { + .btn { + vertical-align: unset; + } } -- cgit v1.2.1 From 16361cea78f31d8d38f1c1dd17fe11ae6e68d23c Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Thu, 14 Jun 2018 14:41:34 -0500 Subject: Fix template icons --- app/assets/stylesheets/pages/projects.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 3a495af58dc..7ac0eaec645 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -497,6 +497,12 @@ &:not(:first-child) { border-top: 1px solid $border-color; } + + .btn-template-icon { + position: absolute; + left: $gl-padding; + top: $gl-padding; + } } .template-title { -- cgit v1.2.1