From 7d3042986d037817458e5e5a9ecaf9583f32452e Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Thu, 4 Apr 2024 14:20:01 -0600 Subject: [PATCH 01/12] Center content on desktop --- app/assets/stylesheets/_state-file.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss index 9b0a844659..fb972a7d5a 100644 --- a/app/assets/stylesheets/_state-file.scss +++ b/app/assets/stylesheets/_state-file.scss @@ -179,6 +179,10 @@ line-height: 2.4rem; } + .question-wrapper { + margin: 0 auto; + } + .blue-group { padding: 2rem; margin-bottom: 2rem; From b8444e524f5f3c45562c8e6ab3501500d81b336c Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Thu, 4 Apr 2024 17:01:24 -0600 Subject: [PATCH 02/12] Made content a bit wider --- app/assets/stylesheets/_state-file.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss index fb972a7d5a..3ade65480e 100644 --- a/app/assets/stylesheets/_state-file.scss +++ b/app/assets/stylesheets/_state-file.scss @@ -181,6 +181,7 @@ .question-wrapper { margin: 0 auto; + max-width: 658px; } .blue-group { From 0891dcff7261f0de226a337c2c667b6ed5e87d4d Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Thu, 4 Apr 2024 18:04:16 -0600 Subject: [PATCH 03/12] WIP --- app/assets/stylesheets/_state-file.scss | 29 +++++++- .../layouts/state_file/question.html.erb | 2 +- .../questions/landing_page/edit.html.erb | 71 ++++++++++--------- 3 files changed, 64 insertions(+), 38 deletions(-) diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss index 3ade65480e..9dc637e945 100644 --- a/app/assets/stylesheets/_state-file.scss +++ b/app/assets/stylesheets/_state-file.scss @@ -412,9 +412,32 @@ } } - .landing-page-content { - padding-left: 1rem; - padding-right: 1rem; + .landing-page-outer { + .question-wrapper { + max-width: none; + } + + .landing-page-container { + display: flex; + + .landing-page-content { + padding-left: 1rem; + padding-right: 1rem; + max-width: 570px; + min-width: 570px; + } + + .logo { + display: none; + } + + @media screen and (max-width: $tablet-up) { + + .logo { + display: block; + } + } + } } .partner-logo-wrapper { diff --git a/app/views/layouts/state_file/question.html.erb b/app/views/layouts/state_file/question.html.erb index f881145851..06ca5bcd4b 100644 --- a/app/views/layouts/state_file/question.html.erb +++ b/app/views/layouts/state_file/question.html.erb @@ -5,7 +5,7 @@ <%= yield :form_question %> <% end %> -
+
-outer">
<%= yield :notices %> diff --git a/app/views/state_file/questions/landing_page/edit.html.erb b/app/views/state_file/questions/landing_page/edit.html.erb index f395165246..1a9cb559f0 100644 --- a/app/views/state_file/questions/landing_page/edit.html.erb +++ b/app/views/state_file/questions/landing_page/edit.html.erb @@ -4,46 +4,49 @@ <% content_for :page_title, title %> <% content_for :card do %> -
-

<%= title %>

+
+
+

<%= title %>

- <% unless @user_name.present? %> -

- <%= t(".#{params[:us_state]}.built_with_html") %> -

- <% end %> + <% unless @user_name.present? %> +

+ <%= t(".#{params[:us_state]}.built_with_html") %> +

+ <% end %> -
-
- <%= image_tag state_image_path, alt: "#{state_name} state logo", class: "" %> +
+
+ <%= image_tag state_image_path, alt: "#{state_name} state logo", class: "" %> +
+
+ <%=t(".#{params[:us_state]}.supported_by") %> +
-
- <%=t(".#{params[:us_state]}.supported_by") %> -
-
- <% if @user_name.present? %> -

<%= t(".welcome_back", user_name: @user_name) %>

-

<%= t(".continue", state_name: @state_name) %>

- <%= link_to StateFile::StateFilePagesController.to_path_helper(action: :login_options, us_state: current_intake.state_code), class: "button button--primary button--wide", id: "firstCta" do %> - <%= t("general.sign_in") %> - <% end %> - <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder, id: "start-again-form" do |f| %> + <% if @user_name.present? %> +

<%= t(".welcome_back", user_name: @user_name) %>

+

<%= t(".continue", state_name: @state_name) %>

+ <%= link_to StateFile::StateFilePagesController.to_path_helper(action: :login_options, us_state: current_intake.state_code), class: "button button--primary button--wide", id: "firstCta" do %> + <%= t("general.sign_in") %> + <% end %> + <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder, id: "start-again-form" do |f| %> +

+ <%= t(".not_you", user_name: @user_name) %> + <%=f.submit t(".start_new", state_name: @state_name), class: "button--link" %> +

+ <% end %> + <% else %> +
+ <%= t(".help_text_html") %> +
+ <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder do |f| %> + <%= f.submit t("general.get_started"), class: "button button--primary button--wide", id: "firstCta" %> + <% end %>

- <%= t(".not_you", user_name: @user_name) %> - <%=f.submit t(".start_new", state_name: @state_name), class: "button--link" %> + <%= t(".already_started_html", sign_in_url: StateFile::StateFilePagesController.to_path_helper(action: :login_options, us_state: params[:us_state])) %>

<% end %> - <% else %> -
- <%= t(".help_text_html") %> -
- <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder do |f| %> - <%= f.submit t("general.get_started"), class: "button button--primary button--wide", id: "firstCta" %> - <% end %> -

- <%= t(".already_started_html", sign_in_url: StateFile::StateFilePagesController.to_path_helper(action: :login_options, us_state: params[:us_state])) %> -

- <% end %> +
+ <%= image_tag 'questions/welcome.svg', class: 'fyst-home-image' %>
<% end %> From a9849a423de500318f4a4273f8c223a867214a46 Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Fri, 5 Apr 2024 09:01:58 -0600 Subject: [PATCH 04/12] WIP --- app/assets/stylesheets/_state-file.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss index 9dc637e945..d9f388ce06 100644 --- a/app/assets/stylesheets/_state-file.scss +++ b/app/assets/stylesheets/_state-file.scss @@ -423,8 +423,6 @@ .landing-page-content { padding-left: 1rem; padding-right: 1rem; - max-width: 570px; - min-width: 570px; } .logo { @@ -436,6 +434,11 @@ .logo { display: block; } + + .landing-page-content { + max-width: 570px; + min-width: 570px; + } } } } From 6f2463f7b3769542f9cea23faae13f7befc08c95 Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Fri, 5 Apr 2024 09:54:17 -0600 Subject: [PATCH 05/12] WIP --- app/assets/stylesheets/_state-file.scss | 58 ++++++++++--------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss index d9f388ce06..d381565676 100644 --- a/app/assets/stylesheets/_state-file.scss +++ b/app/assets/stylesheets/_state-file.scss @@ -179,11 +179,6 @@ line-height: 2.4rem; } - .question-wrapper { - margin: 0 auto; - max-width: 658px; - } - .blue-group { padding: 2rem; margin-bottom: 2rem; @@ -412,37 +407,6 @@ } } - .landing-page-outer { - .question-wrapper { - max-width: none; - } - - .landing-page-container { - display: flex; - - .landing-page-content { - padding-left: 1rem; - padding-right: 1rem; - } - - .logo { - display: none; - } - - @media screen and (max-width: $tablet-up) { - - .logo { - display: block; - } - - .landing-page-content { - max-width: 570px; - min-width: 570px; - } - } - } - } - .partner-logo-wrapper { display: flex; align-items: center; @@ -639,6 +603,28 @@ text-decoration: none; } + @media screen and (min-width: $tablet-up) { + .question-layout .question-wrapper { + margin: 0 auto; + max-width: 658px; + } + .question-layout.landing-page-outer .question-wrapper { + max-width: none; + + .landing-page-container { + display: flex; + .fyst-home-image { + width: 273px; + height: 250px; + } + } + } + } + @media screen and (max-width: $tablet-up) { + .landing-page-container .fyst-home-image { + display: none + } + } } $state-colors: ( From 43e090f34efe7dc5a127eb153623efbce3018120 Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Fri, 5 Apr 2024 09:59:30 -0600 Subject: [PATCH 06/12] WIP --- .../questions/landing_page/edit.html.erb | 72 +++++++++---------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/app/views/state_file/questions/landing_page/edit.html.erb b/app/views/state_file/questions/landing_page/edit.html.erb index 1a9cb559f0..7430d9df7c 100644 --- a/app/views/state_file/questions/landing_page/edit.html.erb +++ b/app/views/state_file/questions/landing_page/edit.html.erb @@ -4,49 +4,47 @@ <% content_for :page_title, title %> <% content_for :card do %> -
-
-

<%= title %>

+
+

<%= title %>

- <% unless @user_name.present? %> -

- <%= t(".#{params[:us_state]}.built_with_html") %> -

- <% end %> + <% unless @user_name.present? %> +

+ <%= t(".#{params[:us_state]}.built_with_html") %> +

+ <% end %> -
-
- <%= image_tag state_image_path, alt: "#{state_name} state logo", class: "" %> -
-
- <%=t(".#{params[:us_state]}.supported_by") %> -
+
+
+ <%= image_tag state_image_path, alt: "#{state_name} state logo", class: "" %>
+
+ <%=t(".#{params[:us_state]}.supported_by") %> +
+
- <% if @user_name.present? %> -

<%= t(".welcome_back", user_name: @user_name) %>

-

<%= t(".continue", state_name: @state_name) %>

- <%= link_to StateFile::StateFilePagesController.to_path_helper(action: :login_options, us_state: current_intake.state_code), class: "button button--primary button--wide", id: "firstCta" do %> - <%= t("general.sign_in") %> - <% end %> - <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder, id: "start-again-form" do |f| %> -

- <%= t(".not_you", user_name: @user_name) %> - <%=f.submit t(".start_new", state_name: @state_name), class: "button--link" %> -

- <% end %> - <% else %> -
- <%= t(".help_text_html") %> -
- <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder do |f| %> - <%= f.submit t("general.get_started"), class: "button button--primary button--wide", id: "firstCta" %> - <% end %> + <% if @user_name.present? %> +

<%= t(".welcome_back", user_name: @user_name) %>

+

<%= t(".continue", state_name: @state_name) %>

+ <%= link_to StateFile::StateFilePagesController.to_path_helper(action: :login_options, us_state: current_intake.state_code), class: "button button--primary button--wide", id: "firstCta" do %> + <%= t("general.sign_in") %> + <% end %> + <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder, id: "start-again-form" do |f| %>

- <%= t(".already_started_html", sign_in_url: StateFile::StateFilePagesController.to_path_helper(action: :login_options, us_state: params[:us_state])) %> + <%= t(".not_you", user_name: @user_name) %> + <%=f.submit t(".start_new", state_name: @state_name), class: "button--link" %>

<% end %> -
- <%= image_tag 'questions/welcome.svg', class: 'fyst-home-image' %> + <% else %> +
+ <%= t(".help_text_html") %> +
+ <%= form_with model: @form, url: { action: :update }, local: true, method: :put, builder: VitaMinFormBuilder do |f| %> + <%= f.submit t("general.get_started"), class: "button button--primary button--wide", id: "firstCta" %> + <% end %> +

+ <%= t(".already_started_html", sign_in_url: StateFile::StateFilePagesController.to_path_helper(action: :login_options, us_state: params[:us_state])) %> +

+ <% end %>
+ <%= image_tag 'questions/welcome.svg', class: 'fyst-home-image' %> <% end %> From 7b6a6ae24591eef9dc92c720fd10063b5f5bff1e Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Fri, 5 Apr 2024 10:42:08 -0600 Subject: [PATCH 07/12] WIP --- app/assets/stylesheets/_state-file.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss index d381565676..781fc71042 100644 --- a/app/assets/stylesheets/_state-file.scss +++ b/app/assets/stylesheets/_state-file.scss @@ -611,8 +611,12 @@ .question-layout.landing-page-outer .question-wrapper { max-width: none; - .landing-page-container { + main { display: flex; + justify-content: space-between; + .landing-page-content { + max-width: 570px; + } .fyst-home-image { width: 273px; height: 250px; From 8e3ddada3cd98312679f0a56c15878708b399a90 Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Mon, 8 Apr 2024 08:44:56 -0600 Subject: [PATCH 08/12] Centered buttons on desktop --- app/assets/stylesheets/_state-file.scss | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss index 781fc71042..9d48d6ecc6 100644 --- a/app/assets/stylesheets/_state-file.scss +++ b/app/assets/stylesheets/_state-file.scss @@ -605,9 +605,18 @@ @media screen and (min-width: $tablet-up) { .question-layout .question-wrapper { + margin: 0 auto; + max-width: 658px; + + .checkbox { + width: 100%; + } + + .button { margin: 0 auto; - max-width: 658px; + } } + .question-layout.landing-page-outer .question-wrapper { max-width: none; @@ -623,6 +632,11 @@ } } } + + .esign-declaration-outer .text--error { + margin: 0 auto; + text-align: center; + } } @media screen and (max-width: $tablet-up) { .landing-page-container .fyst-home-image { From 7f2926c62b29e9818099e24a2b0b33526830672b Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Mon, 8 Apr 2024 08:57:41 -0600 Subject: [PATCH 09/12] Centering buttons --- app/assets/stylesheets/_state-file.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss index 9d48d6ecc6..eba0abc303 100644 --- a/app/assets/stylesheets/_state-file.scss +++ b/app/assets/stylesheets/_state-file.scss @@ -613,6 +613,8 @@ } .button { + display: block; + max-width: 45rem; margin: 0 auto; } } From aa7d8aa081188e7451a90eae6bb1b8922c4a062c Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Mon, 8 Apr 2024 13:38:43 -0600 Subject: [PATCH 10/12] More style updates --- app/assets/stylesheets/_state-file.scss | 30 ++++++++++++++++++- .../state_file/questions/w2/edit.html.erb | 6 ++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/_state-file.scss b/app/assets/stylesheets/_state-file.scss index eba0abc303..6616e5a497 100644 --- a/app/assets/stylesheets/_state-file.scss +++ b/app/assets/stylesheets/_state-file.scss @@ -614,11 +614,24 @@ .button { display: block; - max-width: 45rem; + min-width: 15rem; + max-width: 25rem; margin: 0 auto; } } + .options-wrapper .yes-no-buttons { + display: flex; + justify-content: center; + + .button { + margin: 0 2rem; + display: block; + min-width: 25rem; + max-width: 25rem; + } + } + .question-layout.landing-page-outer .question-wrapper { max-width: none; @@ -635,6 +648,21 @@ } } + .initiate-data-transfer-outer .question-wrapper a.button { + width: 100%; + min-width: 100%; + max-width: 100%; + } + + .esign-declaration-outer, .return-status-outer, .submission-confirmation-outer { + + .question-wrapper .button--primary { + min-width: 40rem; + max-width: 40rem; + width: 40rem; + } + } + .esign-declaration-outer .text--error { margin: 0 auto; text-align: center; diff --git a/app/views/state_file/questions/w2/edit.html.erb b/app/views/state_file/questions/w2/edit.html.erb index f2770acc1e..85006dee8a 100644 --- a/app/views/state_file/questions/w2/edit.html.erb +++ b/app/views/state_file/questions/w2/edit.html.erb @@ -28,9 +28,9 @@
<%= f.cfa_input_field(:locality_nm, t(".box20_locality_name"), classes: ["form-width--long"]) %>
-
+ <% end %> <% end %> From 40619a49ced0662176a1e2c9a993dea85c35c935 Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Mon, 8 Apr 2024 14:00:02 -0600 Subject: [PATCH 11/12] Force Heroku redeploy --- app/views/state_file/questions/w2/edit.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/state_file/questions/w2/edit.html.erb b/app/views/state_file/questions/w2/edit.html.erb index 85006dee8a..140c431c90 100644 --- a/app/views/state_file/questions/w2/edit.html.erb +++ b/app/views/state_file/questions/w2/edit.html.erb @@ -29,6 +29,7 @@ <%= f.cfa_input_field(:locality_nm, t(".box20_locality_name"), classes: ["form-width--long"]) %>
+ From 541dc464a9520ebe5fb3404a617ffe038c5c707e Mon Sep 17 00:00:00 2001 From: Tim O'Farrell Date: Mon, 8 Apr 2024 14:00:44 -0600 Subject: [PATCH 12/12] WIP --- app/views/state_file/questions/w2/edit.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/state_file/questions/w2/edit.html.erb b/app/views/state_file/questions/w2/edit.html.erb index 140c431c90..85006dee8a 100644 --- a/app/views/state_file/questions/w2/edit.html.erb +++ b/app/views/state_file/questions/w2/edit.html.erb @@ -29,7 +29,6 @@ <%= f.cfa_input_field(:locality_nm, t(".box20_locality_name"), classes: ["form-width--long"]) %>
-