Committing before merge

This commit is contained in:
Jonathan Bobel
2023-08-30 11:07:38 -04:00
parent 32083dff99
commit b1c6a768ec
123 changed files with 257 additions and 257 deletions

View File

@@ -1,5 +1,5 @@
{% from "components/form.html" import form_wrapper %}
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% macro banner(body, type=None, with_tick=False, delete_button=None, subhead=None, context=None, action=None, id=None, thing=None) %}
<div
@@ -24,7 +24,7 @@
{% if delete_button %}
{% call form_wrapper(action=action) %}
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
{{ govukButton({
{{ usaButton({
"text": "" if thing else delete_button,
"html": delete_button + "<span class=\"usa-sr-only\"> " + thing + "</span>" if thing else "",
"name": "delete",

View File

@@ -1,3 +1,3 @@
{% macro govukBackLink(params) %}
{% macro usaBackLink(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,3 +1,3 @@
{% macro govukButton(params) %}
{% macro usaButton(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,3 +1,3 @@
{% macro govukCheckboxes(params) %}
{% macro usaCheckboxes(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,3 +1,3 @@
{% macro govukDetails(params) %}
{% macro usaDetails(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,10 +1,10 @@
<details {%- if params.id %} id="{{params.id}}"{% endif %} class="govuk-details margin-bottom-1 {%- if params.classes %} {{ params.classes }}{% endif %}" {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %} {{- " open" if params.open }}>
<summary class="govuk-details__summary">
<span class="govuk-details__summary-text">
<summary class="usa-details__summary">
<span class="usa-details__summary-text">
{{ params.summaryHtml | safe if params.summaryHtml else params.summaryText }}
</span>
</summary>
<div class="govuk-details__text">
<div class="usa-details__text">
{{ params.html | safe if params.html else params.text }}
</div>
</details>

View File

@@ -1,3 +1,3 @@
{% macro govukErrorMessage(params) %}
{% macro usaErrorMessage(params) %}
{%- include "./template.njk" -%}
{% endmacro %}

View File

@@ -1,4 +1,4 @@
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% macro file_upload(
field,
@@ -39,6 +39,6 @@
{% endif %}
<label class="file-upload-filename" for="{{ field.name }}"></label>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
{{ govukButton({ "text": "Submit", "classes": "file-upload-submit" }) }}
{{ usaButton({ "text": "Submit", "classes": "file-upload-submit" }) }}
</form>
{% endmacro %}

View File

@@ -1,4 +1,4 @@
{% from "components/components/button/macro.njk" import govukButton %}
{% from "components/components/button/macro.njk" import usaButton %}
{% macro page_footer(
button_text=None,
@@ -27,7 +27,7 @@
}) %}
{% endif %}
{{ govukButton(button_data) }}
{{ usaButton(button_data) }}
{% endif %}
{% if delete_link %}