Skip to content

Merge to Staging#1981

Merged
YaritzaGarcia merged 2 commits intostagingfrom
main
Mar 5, 2026
Merged

Merge to Staging#1981
YaritzaGarcia merged 2 commits intostagingfrom
main

Conversation

@YaritzaGarcia
Copy link
Collaborator

@YaritzaGarcia YaritzaGarcia commented Mar 4, 2026

Summary

The goal of this PR is to merge the following tickets to staging:

Checklist

Please ensure you have addressed all concerns below before marking a PR "ready for review" or before requesting a re-review. If you cannot complete an item below, replace the checkbox with the ⚠️ :warning: emoji and explain why the step was not completed.

Functionality Checks

  • You have merged the latest changes from the target branch (usually main) into your branch.

  • Your primary commit message is of the format SRCH-#### <description> matching the associated Jira ticket.

  • PR title is either of the format SRCH-#### <description> matching the associated Jira ticket (i.e. "SRCH-123 implement feature X"), or Release - SRCH-####, SRCH-####, SRCH-#### matching the Jira ticket numbers in the release.

  • Automated checks pass. If Code Climate checks do not pass, explain reason for failures:

Process Checks

  • You have specified at least one "Reviewer".

YaritzaGarcia and others added 2 commits March 4, 2026 15:16
…Center (#1961)

* Remove old inactive affiliate banner.

* Add a banner below the Display Name banner. NEEDS TO BE IMPROVED.

* Improve UX for inactive affiliate message in Admin Center.

- Updated variables to have an inactive value and an active value.
- Updated views to add the inactive class to change the height.
- Updated the inactive banner

* Add inactive class to the site nav

* Add USWDS styling and improve overall banner.

* Add USWDS Warning icon.

* Adding the Warning icon before the banner text. Needs to be fixed. Position is not right.

* Adjust height.

* Improve inactive affiliate banner styles and update tests for accurate selector usage

* Update test.

* Update inactive site header.
#1978)

Addresses CVE-2025-55130, CVE-2025-55131, CVE-2025-55132, CVE-2025-59465,
CVE-2025-59466.

Co-authored-by: Luis Metzger <luismetzger@me.com>
Co-authored-by: Yaritza M. Garcia Chaparro <yaritza.garcia@gsa.gov>
@YaritzaGarcia YaritzaGarcia changed the title DRAFT Merge to Staging Merge to Staging Mar 5, 2026
@YaritzaGarcia YaritzaGarcia marked this pull request as ready for review March 5, 2026 18:33
@YaritzaGarcia YaritzaGarcia requested a review from amian-gsa March 5, 2026 18:40
@YaritzaGarcia YaritzaGarcia merged commit 0a845b5 into staging Mar 5, 2026
8 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants