Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Use same Bootstrap version for both Admin and Benefits #2555

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

machikoyasuda
Copy link
Member

closes #2551

The #2491 PR made a regression on Admin, by changing this line in the settings CSP: https://github.com/cal-itp/benefits/pull/2526/files#diff-d71405aa44f1e899a9cd920e5187aa1d02affdbd0da472eca95f814b0a8c1210R357, which then made the Bootstrap CSS version used on Admin inaccessible.

This PR:

  • Moves the Bootstrap includes from Admin into Core
  • Upgrades the Bootstrap includes version to 5.3.3
  • Uses that includes in both Admin and Benefits apps

QA:

  • QA the app flow on Benefits
  • QA a in-person verification flow on Admin
  • QA logging in and out of Admin

I've now realized that #2491 introduced a few small changes (mostly deleting style declarations no longer necessary, that were overriding CA State Web Template) to the Button CSS in the Benefits app stylesheet, but not Admin's Button CSS - which had copied Benefits' CSS. This PR is not attempting to bring in those changes from Benefits CSS to Admin CSS. It's still a little weird that the two files' Button CSS are now diverging, and I think that can be done in a future clean up ticket.

@machikoyasuda machikoyasuda requested a review from a team as a code owner December 2, 2024 23:26
@machikoyasuda machikoyasuda self-assigned this Dec 2, 2024
@github-actions github-actions bot added front-end HTML/CSS/JavaScript and Django templates deployment-dev [auto] Changes that will trigger a deploy if merged to dev labels Dec 2, 2024
Copy link

github-actions bot commented Dec 2, 2024

Coverage report

This PR does not seem to contain any modification to coverable code.

Copy link
Member

@angela-tran angela-tran left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks @machikoyasuda!

Screenshot from 2024-12-02 17-31-36
Screenshot from 2024-12-02 17-31-52
Screenshot from 2024-12-02 17-31-58

@angela-tran
Copy link
Member

I noticed in dev-benefits.calitp.org that the skip link is showing even though I haven't pressed Tab or anything:
image

I don't see this locally though:
image

Will create a separate bug ticket for this

Copy link
Member

@lalver1 lalver1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally and it looks great! 👍

@machikoyasuda machikoyasuda merged commit 8fd2c5a into main Dec 5, 2024
12 checks passed
@machikoyasuda machikoyasuda deleted the fix/2551-bootstrap-universal branch December 5, 2024 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployment-dev [auto] Changes that will trigger a deploy if merged to dev front-end HTML/CSS/JavaScript and Django templates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Styles in Benefits Administrator show regression
4 participants