Skip to content

BB2-5251 fix make css - #1787

Open
rsjimenez-icf wants to merge 23 commits into
masterfrom
BB2-5251-fix-make-css
Open

rsjimenez-icf wants to merge 23 commits into
masterfrom
BB2-5251-fix-make-css

Conversation

@rsjimenez-icf

@rsjimenez-icf rsjimenez-icf commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

JIRA Ticket:
BB2-5251

What Does This PR Do?

This PR adds imports to the new paths for design-systems and adjust css classes that have been renamed.

What Should Reviewers Watch For?

This should likely be covered on two fronts:

  1. A developer who is having trouble with their CSS should try this to fix their local environment's CSS.

  2. A dev who does not have CSS issues should run through this to make sure it down not break anything styling-wise.

This is a list of all files that COULD be affected by the changes as they contain at least one header tag:

apps/accounts/templates/

account-settings.html
email-password-reset-link.html
registration/login.html
registration/passwd_change_form.html
registration/password_forgot_form.html
registration/password_forgot_reset_complete.html
registration/password_forgot_reset_confirm_form.html
registration/password_forgot_reset_done.html
registration/signup.html

apps/bb2_tools/templates/admin/

apps_stats_change_list.html
bb2_bene_dashboard_change_form.html
bb2_splunk_dashboards_change_list.html
token_counts_by_apps_change_list.html
user_counts_by_date_change_list.html

Other app templates

get_creds.html
404.html
application_confirm_delete.html
application_detail.html
application_form.html
application_list.html
authorize.html
authorized-tokens.html
authenticated-home.html
index.html
authorize.html
home.html
results.html

templates/

404.html
500.html
auth_base.html
base.html
design_system/authorize.html
design_system/authorize/notices.html
design_system/authorize/warnings.html
design_system/authorize_v2.html
design_system/authorize_v3.html
design_system/new_authorize_v2.html
email/email-activate.html
email/email-password-forgot-link.html
email/email-success-first-api-call-template.html
email/email-success-first-app-template.html
generic/split60_50.html
include/app-form-optional-info.html
include/app-form-required-info.html
include/footer.html
testobject.html

ops/

login.html

If you're reviewing this PR, please check for these things in particular:

Validation

As a dev with CSS issues:

  1. I would delete/prune containers in Podman
  2. Run `make build-local'
  3. Run 'make collectstatic' - This has the make css subtask in it and should now import from the new paths
  4. I'm not sure if this is mandatory, but I did run npm run gulp from the static/bluebutton-css folder
  5. Run locally and see if CSS is now appearing

As a dev WITHOUT CSS issues:

  1. Run `make build-local'
  2. Run 'make collectstatic' - This has the make css subtask in it and should now import from the new paths
  3. I'm not sure if this is mandatory, but I did run npm run gulp from the static/bluebutton-css folder
  4. Run locally and see if CSS is now appearing

What Security Implications Does This PR Have?

Please indicate if this PR does any of the following:

  • Adds any new software dependencies
  • Modifies any security controls
  • Adds new transmission or storage of data
  • Any other changes that could possibly affect security?
  • Yes, one or more of the above security implications apply. This PR must not be merged without the ISSO or team
    security engineer's approval.

Any Migrations?

  • Yes, there are migrations
    • The migrations should be run PRIOR to the code being deployed
    • The migrations should be run AFTER the code is deployed
    • There is a more complicated migration plan (downtime,
      etc)
  • No migrations

@rsjimenez-icf
rsjimenez-icf marked this pull request as ready for review October 29, 2026 17:53
@annamontare-nava annamontare-nava self-assigned this Oct 29, 2026
@annamontare-nava
annamontare-nava self-requested a review October 29, 2026 18:37
@ryan-morosa

Copy link
Copy Markdown
Contributor

@rsjimenez-icf Just an fyi I think whatever merge from master into your branch you did is causing a lot of these other files to pop up with changes and looks a little wonky.

@annamontare-nava

Copy link
Copy Markdown
Contributor

It looks like there are a number of changes that aren't part of fixing the css, maybe some kind of git issue? Could you remove those?

@rsjimenez-icf

Copy link
Copy Markdown
Contributor Author

@rsjimenez-icf Just an fyi I think whatever merge from master into your branch you did is causing a lot of these other files to pop up with changes and looks a little wonky.

Yeah i pulled in my security bump to test something. I reverted the commit, but it is still showing other files. I'll fix it

@JamesDemeryNava

Copy link
Copy Markdown
Contributor

@rsjimenez-icf After pruning volumes and running make build-local and make collectstatic the styles do work for me! One thing I noticed is that some of the headers no longer look like they did before. Not sure if this is because the design-system PR also needs to be merged and this PR rebased before those will look the same? Example below:

Screenshot 2026-10-30 at 9 45 13 AM Screenshot 2026-10-30 at 9 45 19 AM

@annamontare-nava

Copy link
Copy Markdown
Contributor

Also noticing the selenium tests fail on this. We should make sure they pass before merging

Comment thread ops/containers/README.md Resolved

@annamontare-nava annamontare-nava left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some comments, but hopefully we're close!

@rsjimenez-icf rsjimenez-icf mentioned this pull request Nov 4, 2026
1 of 6 tasks
@jimmyfagan
jimmyfagan marked this pull request as draft November 16, 2026 18:03

<div>
<input type="checkbox" name="agree" id="id_agree" {% if application.name %} checked {% endif %}>
<input class="ds-c-choice ds-c-choice--small" type="checkbox" name="agree" id="id_agree" {% if application.name %} checked {% endif %}>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This restores the checkbox to the required Agree to terms input

# Only install socat if we are building the local container.
USER root
RUN dnf install -y \
gettext \

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

As discussed in Eng sync, this was added as it is needed in all our containers to run compliemessages in our containers. Not directly related to the PR, but we approved adding it in an PR since it is once line and just an addition

@import 'accordion';
@import 'copy-button';
@import 'UsaBanner';

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This standardizes the size of headers throughout the app

Randy Jimenez added 2 commits November 17, 2026 09:36
color: $black;
}

.control-label,

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Fixing a odd one off issue where the checkbox text lost it's styling

<div class="ds-l-col--12 ds-l-sm-col--6 ds-l-md-col--3 ds-u-margin-bottom--2">
<h6 class="ds-h4">Blue Button API</h6>
<ul class="ds-c-list ds-c-list--bare ds-u-font-size--small">
<h6 class="ds-text-heading--lg">Blue Button API</h6>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

These classes are still here as h6's are an outlier, this can be added to the global css if wanted

margin: 0 0 0.5rem 0;
text-transform: uppercase;
}
h1,

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is a specific styling for our banner titles that are within .gradient-content-container

@rsjimenez-icf
rsjimenez-icf marked this pull request as ready for review November 17, 2026 14:56
@annamontare-nava

Copy link
Copy Markdown
Contributor

npm run gulp does seem to be necessary to get all the styles to load properly, but that maybe shouldn't be the case.

@JamesDemeryNava

Copy link
Copy Markdown
Contributor

I pruned all containers, volumes, and images and ran build-local, collectstatic, and npm run gulp in static/bluebutton-css. The headers still look off when I then execute make run-local:

Screenshot 2026-11-18 at 9 12 23 AM

@JamesDemeryNava JamesDemeryNava left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

By running npm run gulp in static/bluebutton-css before running make build-local and make collectstatic, I see all the stylings as expected now. Everything looks good to me besides the checkbox on v1/o/applications/register. The box fills but no checkmark is displayed. If that can be resolved relatively easily, I say we try to resolve that before this PR is merged

@rsjimenez-icf

Copy link
Copy Markdown
Contributor Author

By running npm run gulp in static/bluebutton-css before running make build-local and make collectstatic, I see all the stylings as expected now. Everything looks good to me besides the checkbox on v1/o/applications/register. The box fills but no checkmark is displayed. If that can be resolved relatively easily, I say we try to resolve that before this PR is merged

Done!

@rsjimenez-icf

Copy link
Copy Markdown
Contributor Author

Oops, I meant to close the comment, not the PR

This branch has not been deployed

No deployments
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.

4 participants