From 5da347f25728bec46622f46402a6851ced204b7e Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Mon, 9 Dec 2024 22:22:16 +0000 Subject: [PATCH 01/10] feat(help): realign Help page width, combine some divs --- benefits/core/templates/core/help.html | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/benefits/core/templates/core/help.html b/benefits/core/templates/core/help.html index ef3325904..b23036226 100644 --- a/benefits/core/templates/core/help.html +++ b/benefits/core/templates/core/help.html @@ -9,13 +9,8 @@ {% block main-content %}
-
+

{% translate "Help" %}

-
-
- -
-

{% translate "What is Cal-ITP Benefits?" %}

{% blocktranslate trimmed %} @@ -137,11 +132,7 @@

{% translate "Questions?" %}

provider. {% endblocktranslate %}

-
-
-
-
{% if agency %} {% include "core/includes/agency-links.html" %} {% else %} @@ -152,8 +143,8 @@

{% translate "Questions?" %}

-
-
+
+
{% translate "Go Back" as button_text %} {% include "core/includes/button--origin.html" with button_text=button_text %}
From 70059fd966e3527494fd2bdfa5cfebb7801be99a Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 10 Dec 2024 00:21:34 +0000 Subject: [PATCH 02/10] feat(error-base): realign error base for 400, etc. standard errors --- benefits/templates/error.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/benefits/templates/error.html b/benefits/templates/error.html index 1fba99da6..b06de2efe 100644 --- a/benefits/templates/error.html +++ b/benefits/templates/error.html @@ -7,22 +7,21 @@ {% endblock page-title %} {% block main-content %} -
-

- {% include "core/includes/icon.html" with name="sadbus" %} - {% block headline %} - {% endblock headline %} -

- +
-
+
+
{% include "core/includes/icon.html" with name="sadbus" %}
+

+ {% block headline %} + {% endblock headline %} +

{% block paragraphs %} {% endblock paragraphs %}
-
+
{% block button %} {% include "core/includes/button--origin.html" %} {% endblock button %} From f1d9a8b7fe7d2ec8f088a2fba5305cc950cf24c3 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 10 Dec 2024 00:51:10 +0000 Subject: [PATCH 03/10] refactor: remove unused class --- benefits/templates/error.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benefits/templates/error.html b/benefits/templates/error.html index b06de2efe..488014375 100644 --- a/benefits/templates/error.html +++ b/benefits/templates/error.html @@ -7,7 +7,7 @@ {% endblock page-title %} {% block main-content %} -
+
{% include "core/includes/icon.html" with name="sadbus" %}
From 088fc9796164dfde21d12b6824ccdb707523681b Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 10 Dec 2024 01:21:05 +0000 Subject: [PATCH 04/10] feat(system-error): redesign, combine divs and delete now unnecessary css --- .../templates/enrollment/system_error.html | 20 +++++-------------- .../oauth/templates/oauth/system_error.html | 16 +++++---------- benefits/static/css/styles.css | 8 +------- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/benefits/enrollment/templates/enrollment/system_error.html b/benefits/enrollment/templates/enrollment/system_error.html index 42382a631..d19bfecc8 100644 --- a/benefits/enrollment/templates/enrollment/system_error.html +++ b/benefits/enrollment/templates/enrollment/system_error.html @@ -1,35 +1,25 @@ {% extends "core/base.html" %} {% load i18n %} -{% block classes %} - {{ block.super | add:" system-enrollment-error" }} -{% endblock classes %} - {% block page-title %} {% translate "Enrollment system down" %} {% endblock page-title %} {% block main-content %}
-

- {% include "core/includes/icon.html" with name="bankcardquestion" %} - {% translate "Our enrollment system is not working right now." %} -

-
-
+
+
{% include "core/includes/icon.html" with name="sadbus" %}
+

{% translate "Our enrollment system is not working right now." %}

{% translate "We’re working to solve the problem. Please wait 48 hours and try to enroll again, or contact your transit agency for help." %}

+

{% include "core/includes/agency-links.html" %}

-
-
{% include "core/includes/agency-links.html" %}
-
-
-
+
{% if authentication and authentication.sign_out_link_template %} {% translate "Sign out of" as button_text %}