From 686fa0bd9f821f9181434d3fe877644e04dc59e0 Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Thu, 9 Jan 2025 09:41:18 -0800 Subject: [PATCH 01/18] removed the ignore on the security check workflow --- .github/workflows/security-check.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/security-check.yaml b/.github/workflows/security-check.yaml index aea700613..bf0498fff 100644 --- a/.github/workflows/security-check.yaml +++ b/.github/workflows/security-check.yaml @@ -2,17 +2,9 @@ name: Security checks on: push: - paths-ignore: - - 'docs/**' - - '**.md' - - '.gitignore' branches: - main pull_request: - paths-ignore: - - 'docs/**' - - '**.md' - - '.gitignore' branches: - main From 7ea7aa3d92b2005c558de56012425b017dbc89be Mon Sep 17 00:00:00 2001 From: Alysia Broddrick Date: Thu, 9 Jan 2025 15:22:14 -0800 Subject: [PATCH 02/18] removed todo so security checks would pass --- src/registrar/models/domain_information.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py index b1c4fd806..aa933e282 100644 --- a/src/registrar/models/domain_information.py +++ b/src/registrar/models/domain_information.py @@ -101,7 +101,6 @@ class DomainInformation(TimeStampedModel): verbose_name="election office", ) - # TODO - Ticket #1911: stub this data from DomainRequest organization_type = models.CharField( max_length=255, choices=DomainRequest.OrgChoicesElectionOffice.choices, From 1bc83a1c3e44aeb9d0d78b07aff4eab5db48caa9 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Fri, 10 Jan 2025 15:32:00 -0500 Subject: [PATCH 03/18] normalize summary box --- .../assets/src/sass/_theme/_admin.scss | 21 +++++++++++-------- .../assets/src/sass/_theme/_base.scss | 1 - .../assets/src/sass/_theme/_summary-box.scss | 15 +++++++++++++ .../assets/src/sass/_theme/styles.scss | 1 + 4 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 src/registrar/assets/src/sass/_theme/_summary-box.scss diff --git a/src/registrar/assets/src/sass/_theme/_admin.scss b/src/registrar/assets/src/sass/_theme/_admin.scss index a71804d77..afdb39551 100644 --- a/src/registrar/assets/src/sass/_theme/_admin.scss +++ b/src/registrar/assets/src/sass/_theme/_admin.scss @@ -812,16 +812,19 @@ div.dja__model-description{ text-decoration: underline !important; } -//-- Override some styling for the USWDS summary box (per design quidance for ticket #2055 -.usa-summary-box { - background: #{$dhs-blue-10}; - border-color: #{$dhs-blue-30}; - max-width: 72ex; - word-wrap: break-word; -} +//-- Override some styling for the USWDS summary box (per design guidance for ticket #2055) +// Keep it scoped to admin.scss +.dashboard { + .usa-summary-box { + background: #{$dhs-blue-10}; + border-color: #{$dhs-blue-30}; + max-width: 72ex; + word-wrap: break-word; + } -.usa-summary-box h3 { - color: #{$dhs-blue-60}; + .usa-summary-box h3 { + color: #{$dhs-blue-60}; + } } .module caption, .inline-group h2 { diff --git a/src/registrar/assets/src/sass/_theme/_base.scss b/src/registrar/assets/src/sass/_theme/_base.scss index d73becd75..0e726ff37 100644 --- a/src/registrar/assets/src/sass/_theme/_base.scss +++ b/src/registrar/assets/src/sass/_theme/_base.scss @@ -59,7 +59,6 @@ body { } h2 { - color: color('primary-dark'); margin-top: units(2); margin-bottom: units(2); } diff --git a/src/registrar/assets/src/sass/_theme/_summary-box.scss b/src/registrar/assets/src/sass/_theme/_summary-box.scss new file mode 100644 index 000000000..91693ff02 --- /dev/null +++ b/src/registrar/assets/src/sass/_theme/_summary-box.scss @@ -0,0 +1,15 @@ +// USWDS override to basically match the header size to a standard h3 size +// This get complicated because USWDS sets a size on the container then a relative +// size on the header. We'll need to reset the container size, override the header size, +// then 'fix' the content size. +.usa-summary-box { + font-size: 1rem; + .usa-summary-box__heading { + font-size: 1.17em; + } + p, li, dd { + font-size: 1.06rem; + } +} + + \ No newline at end of file diff --git a/src/registrar/assets/src/sass/_theme/styles.scss b/src/registrar/assets/src/sass/_theme/styles.scss index 78d27b2e0..493ebd542 100644 --- a/src/registrar/assets/src/sass/_theme/styles.scss +++ b/src/registrar/assets/src/sass/_theme/styles.scss @@ -17,6 +17,7 @@ @forward "forms"; @forward "search"; @forward "tooltips"; +@forward "summary-box"; @forward "fieldsets"; @forward "alerts"; @forward "tables"; From 7dbb9de3b9925bf955a683132094ca7835e213d7 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Fri, 10 Jan 2025 16:18:11 -0500 Subject: [PATCH 04/18] use typeset mixin instead of hardcoded values in summary-box --- src/registrar/assets/src/sass/_theme/_summary-box.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/registrar/assets/src/sass/_theme/_summary-box.scss b/src/registrar/assets/src/sass/_theme/_summary-box.scss index 91693ff02..fdaf165e2 100644 --- a/src/registrar/assets/src/sass/_theme/_summary-box.scss +++ b/src/registrar/assets/src/sass/_theme/_summary-box.scss @@ -5,10 +5,12 @@ .usa-summary-box { font-size: 1rem; .usa-summary-box__heading { - font-size: 1.17em; + // 1.17em / 18.72px + @include typeset('sans', 'sm', 6); } p, li, dd { - font-size: 1.06rem; + // 1.06rem / 16.96px + @include typeset('sans', 'sm', 5); } } From 0e9d69a26f8eeab84c0c7a73e3f97b86fc10848d Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Mon, 13 Jan 2025 15:43:37 -0500 Subject: [PATCH 05/18] clean up summary boxes --- .../assets/src/sass/_theme/_admin.scss | 19 ------------ .../assets/src/sass/_theme/_base.scss | 10 ------- .../assets/src/sass/_theme/_summary-box.scss | 25 +++++++--------- .../assets/src/sass/_theme/_typography.scss | 6 ++-- .../admin/domain_delete_confirmation.html | 2 +- .../domain_delete_selected_confirmation.html | 2 +- src/registrar/templates/domain_detail.html | 25 +++++++--------- src/registrar/templates/domain_dnssec.html | 30 ++++++++++--------- .../domain_request_awaiting_review.html | 4 +-- .../includes/profile_information.html | 2 +- .../includes/request_status_manage.html | 24 +++++++-------- 11 files changed, 56 insertions(+), 93 deletions(-) diff --git a/src/registrar/assets/src/sass/_theme/_admin.scss b/src/registrar/assets/src/sass/_theme/_admin.scss index afdb39551..7ffd6d6b1 100644 --- a/src/registrar/assets/src/sass/_theme/_admin.scss +++ b/src/registrar/assets/src/sass/_theme/_admin.scss @@ -516,10 +516,6 @@ input[type=submit].button--dja-toolbar:focus, input[type=submit].button--dja-too max-width: 68ex; } -.usa-summary-box__dhs-color { - color: $dhs-blue-70; -} - details.dja-detail-table { display: inline-table; background-color: var(--body-bg); @@ -812,21 +808,6 @@ div.dja__model-description{ text-decoration: underline !important; } -//-- Override some styling for the USWDS summary box (per design guidance for ticket #2055) -// Keep it scoped to admin.scss -.dashboard { - .usa-summary-box { - background: #{$dhs-blue-10}; - border-color: #{$dhs-blue-30}; - max-width: 72ex; - word-wrap: break-word; - } - - .usa-summary-box h3 { - color: #{$dhs-blue-60}; - } -} - .module caption, .inline-group h2 { text-transform: capitalize; } diff --git a/src/registrar/assets/src/sass/_theme/_base.scss b/src/registrar/assets/src/sass/_theme/_base.scss index 0e726ff37..60018511f 100644 --- a/src/registrar/assets/src/sass/_theme/_base.scss +++ b/src/registrar/assets/src/sass/_theme/_base.scss @@ -129,16 +129,6 @@ grid column to the max-width of the searchbar, which was calculated to be 33rem. word-break: break-word; } -.dotgov-status-box { - background-color: color('primary-lightest'); - border-color: color('accent-cool-lighter'); -} - -.dotgov-status-box--action-need { - background-color: color('warning-lighter'); - border-color: color('warning'); -} - footer { border-top: 1px solid color('primary-darker'); } diff --git a/src/registrar/assets/src/sass/_theme/_summary-box.scss b/src/registrar/assets/src/sass/_theme/_summary-box.scss index fdaf165e2..112829e6c 100644 --- a/src/registrar/assets/src/sass/_theme/_summary-box.scss +++ b/src/registrar/assets/src/sass/_theme/_summary-box.scss @@ -1,17 +1,12 @@ -// USWDS override to basically match the header size to a standard h3 size -// This get complicated because USWDS sets a size on the container then a relative -// size on the header. We'll need to reset the container size, override the header size, -// then 'fix' the content size. -.usa-summary-box { - font-size: 1rem; - .usa-summary-box__heading { - // 1.17em / 18.72px - @include typeset('sans', 'sm', 6); - } - p, li, dd { - // 1.06rem / 16.96px - @include typeset('sans', 'sm', 5); - } -} +@use "uswds-core" as *; +.usa-summary-box { + background-color: color('primary-lightest'); + border-color: color('accent-cool-lighter'); +} + +.usa-summary-box--action-needed { + background-color: color('warning-lighter'); + border-color: color('warning'); +} \ No newline at end of file diff --git a/src/registrar/assets/src/sass/_theme/_typography.scss b/src/registrar/assets/src/sass/_theme/_typography.scss index db19a595b..3fb61ccfd 100644 --- a/src/registrar/assets/src/sass/_theme/_typography.scss +++ b/src/registrar/assets/src/sass/_theme/_typography.scss @@ -10,17 +10,19 @@ address, max-width: measure(5); } +h1, h2, h3, h4, h5, h6 { + color: color('primary-darker'); +} + h1 { @include typeset('sans', '2xl', 2); margin: 0 0 units(2); - color: color('primary-darker'); } h2 { font-weight: font-weight('semibold'); line-height: line-height('heading', 3); margin: units(4) 0 units(1); - color: color('primary-darker'); } .header--body { diff --git a/src/registrar/templates/django/admin/domain_delete_confirmation.html b/src/registrar/templates/django/admin/domain_delete_confirmation.html index 5a9bef5b0..3228188d7 100644 --- a/src/registrar/templates/django/admin/domain_delete_confirmation.html +++ b/src/registrar/templates/django/admin/domain_delete_confirmation.html @@ -8,7 +8,7 @@ aria-labelledby="summary-box-description" >
-

+

When a domain is deleted:

diff --git a/src/registrar/templates/django/admin/domain_delete_selected_confirmation.html b/src/registrar/templates/django/admin/domain_delete_selected_confirmation.html index 3e0a32a4d..68f726708 100644 --- a/src/registrar/templates/django/admin/domain_delete_selected_confirmation.html +++ b/src/registrar/templates/django/admin/domain_delete_selected_confirmation.html @@ -9,7 +9,7 @@ aria-labelledby="summary-box-description" >
-

+

When a domain is deleted:

diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html index a5b8e52cb..56c46ed0f 100644 --- a/src/registrar/templates/domain_detail.html +++ b/src/registrar/templates/domain_detail.html @@ -23,19 +23,15 @@

{{ domain.name }}

-

- - Status: - - - +

+ Status: {# UNKNOWN domains would not have an expiration date and thus would show 'Expired' #} {% if domain.is_expired and domain.state != domain.State.UNKNOWN %} Expired @@ -46,9 +42,10 @@ {% else %} {{ domain.state|title }} {% endif %} - +

+ {% if domain.get_state_help_text %} -
+

{% if has_domain_renewal_flag and domain.is_expiring and is_domain_manager %} This domain will expire soon. Renew to maintain access. {% elif has_domain_renewal_flag and domain.is_expiring and is_portfolio_user %} @@ -56,13 +53,11 @@ {% else %} {{ domain.get_state_help_text }} {% endif %} -

+

{% endif %} -

+
-
-
- +
{% include "includes/domain_dates.html" %} diff --git a/src/registrar/templates/domain_dnssec.html b/src/registrar/templates/domain_dnssec.html index a795fb2fc..a55bd8d23 100644 --- a/src/registrar/templates/domain_dnssec.html +++ b/src/registrar/templates/domain_dnssec.html @@ -33,23 +33,25 @@
{% csrf_token %} - {% if has_dnssec_records %} +
-

-

To fully disable DNSSEC

-
    -
  • Click “Disable DNSSEC” below.
    • -
  • Wait until the Time to Live (TTL) expires on your DNSSEC records managed by your DNS hosting provider. This is often less than 24 hours, but confirm with your provider.
    • -
  • After the TTL expiration, disable DNSSEC at your DNS hosting provider.
    • -
-

Warning: If you disable DNSSEC at your DNS hosting provider before TTL expiration, this may cause your domain to appear offline.

+

To fully disable DNSSEC

+ +
+
    +
  • Click “Disable DNSSEC” below.
    • +
  • Wait until the Time to Live (TTL) expires on your DNSSEC records managed by your DNS hosting provider. This is often less than 24 hours, but confirm with your provider.
    • +
  • After the TTL expiration, disable DNSSEC at your DNS hosting provider.
    • +
+

Warning: If you disable DNSSEC at your DNS hosting provider before TTL expiration, this may cause your domain to appear offline.

+
+

DNSSEC is enabled on your domain

@@ -60,7 +62,7 @@ data-open-modal >Disable DNSSEC - {% else %} +
@@ -69,7 +71,7 @@
Enable DNSSEC
- {% endif %} +
+

Next steps in this process

We received your .gov domain request. Our next step is to review your request. This usually takes 30 business days. We’ll email you if we have questions and when we complete our review. Contact us with any questions.

{% if show_withdraw_text %} -

+

Need to make changes?

diff --git a/src/registrar/templates/includes/profile_information.html b/src/registrar/templates/includes/profile_information.html index 3e7c827f1..257e8d1dc 100644 --- a/src/registrar/templates/includes/profile_information.html +++ b/src/registrar/templates/includes/profile_information.html @@ -12,7 +12,7 @@ Your contact information
-