From 16eb5012a2b7b5d47e46b147f1f267007ad49f4e Mon Sep 17 00:00:00 2001 From: Peter Kos Date: Sat, 19 Sep 2020 21:50:15 -0400 Subject: [PATCH 1/2] Hackthon name title page has newline --- app/assets/stylesheets/forms/_forms.sass | 5 +++++ app/views/devise/passwords/edit.html.haml | 2 +- app/views/devise/passwords/new.html.haml | 2 +- app/views/devise/registrations/new.html.haml | 2 +- app/views/devise/sessions/new.html.haml | 2 +- app/views/questionnaires/new.html.haml | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/forms/_forms.sass b/app/assets/stylesheets/forms/_forms.sass index 547db9e6e..8faf5bf00 100644 --- a/app/assets/stylesheets/forms/_forms.sass +++ b/app/assets/stylesheets/forms/_forms.sass @@ -61,6 +61,11 @@ hr .btn margin-bottom: 30px +.text-overflow-center + text-align: center + display: flex + justify-content: center + .simple_form @include css4 color: var(--grey) diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml index 76f92f72b..d5e8784c5 100644 --- a/app/views/devise/passwords/edit.html.haml +++ b/app/views/devise/passwords/edit.html.haml @@ -2,7 +2,7 @@ .form-container.password .section-title.center Change Your - %span.emphasized Password + %div.emphasized Password = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| = f.error_notification = f.input :reset_password_token, as: :hidden diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index 18281428a..08b47dba0 100644 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -2,6 +2,6 @@ .form-container.password %h1.section-title.center Reset Your - %span.emphasized Password + %div.emphasized Password = render 'form' diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index e0e19883e..c416914fd 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -2,7 +2,7 @@ .form-container.signup %h1.section-title.center Register for - %span.emphasized= HackathonConfig['name'] + %div.emphasized.text-overflow-center= HackathonConfig['name'] - if !HackathonConfig['accepting_questionnaires'] || HackathonConfig['disclaimer_message'].present? #disclaimer diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 822d2b20f..08f6cba97 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -2,5 +2,5 @@ .form-container.login %h1.section-title.center Sign in to - %span.emphasized= HackathonConfig['name'] + %div.emphasized.text-overflow-center= HackathonConfig['name'] = render 'form' diff --git a/app/views/questionnaires/new.html.haml b/app/views/questionnaires/new.html.haml index 6d389312f..7e0cbf413 100644 --- a/app/views/questionnaires/new.html.haml +++ b/app/views/questionnaires/new.html.haml @@ -3,7 +3,7 @@ .form-container %h1.section-title Apply for - %span.emphasized= HackathonConfig['name'] + %div.emphasized.text-overflow-center= HackathonConfig['name'] = render 'form' - else .form-container From 23038ae49ed42e30e39be5747639b05ddebaab22 Mon Sep 17 00:00:00 2001 From: Peter Kos Date: Sat, 19 Sep 2020 21:57:44 -0400 Subject: [PATCH 2/2] Make houndbot happy --- app/views/devise/passwords/edit.html.haml | 2 +- app/views/devise/passwords/new.html.haml | 2 +- app/views/devise/registrations/new.html.haml | 2 +- app/views/devise/sessions/new.html.haml | 2 +- app/views/questionnaires/new.html.haml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml index d5e8784c5..4a866a98e 100644 --- a/app/views/devise/passwords/edit.html.haml +++ b/app/views/devise/passwords/edit.html.haml @@ -2,7 +2,7 @@ .form-container.password .section-title.center Change Your - %div.emphasized Password + .emphasized Password = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| = f.error_notification = f.input :reset_password_token, as: :hidden diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index 08b47dba0..b856f1727 100644 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -2,6 +2,6 @@ .form-container.password %h1.section-title.center Reset Your - %div.emphasized Password + .emphasized Password = render 'form' diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index c416914fd..50d55651b 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -2,7 +2,7 @@ .form-container.signup %h1.section-title.center Register for - %div.emphasized.text-overflow-center= HackathonConfig['name'] + .emphasized.text-overflow-center= HackathonConfig['name'] - if !HackathonConfig['accepting_questionnaires'] || HackathonConfig['disclaimer_message'].present? #disclaimer diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 08f6cba97..b9bb3896c 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -2,5 +2,5 @@ .form-container.login %h1.section-title.center Sign in to - %div.emphasized.text-overflow-center= HackathonConfig['name'] + .emphasized.text-overflow-center= HackathonConfig['name'] = render 'form' diff --git a/app/views/questionnaires/new.html.haml b/app/views/questionnaires/new.html.haml index 7e0cbf413..229d9ed09 100644 --- a/app/views/questionnaires/new.html.haml +++ b/app/views/questionnaires/new.html.haml @@ -3,7 +3,7 @@ .form-container %h1.section-title Apply for - %div.emphasized.text-overflow-center= HackathonConfig['name'] + .emphasized.text-overflow-center= HackathonConfig['name'] = render 'form' - else .form-container