Repository navigation
BB2-5251 fix make css - #1787
rsjimenez-icf wants to merge 23 commits into
Conversation
|
@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. |
|
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? |
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 |
30fb2b0 to
4c4795a
Compare
|
@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:
|
…web-server into BB2-5251-fix-make-css
|
Also noticing the selenium tests fail on this. We should make sure they pass before merging |
…web-server into BB2-5251-fix-make-css
annamontare-nava
left a comment
There was a problem hiding this comment.
Some comments, but hopefully we're close!
…web-server into BB2-5251-fix-make-css
|
|
||
| <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 %}> |
There was a problem hiding this comment.
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 \ |
There was a problem hiding this comment.
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'; | ||
|
|
There was a problem hiding this comment.
This standardizes the size of headers throughout the app
…web-server into BB2-5251-fix-make-css
| color: $black; | ||
| } | ||
|
|
||
| .control-label, |
There was a problem hiding this comment.
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> |
There was a problem hiding this comment.
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, |
There was a problem hiding this comment.
This is a specific styling for our banner titles that are within .gradient-content-container
|
|
JamesDemeryNava
left a comment
There was a problem hiding this comment.
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! |
|
Oops, I meant to close the comment, not the PR |



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:
A developer who is having trouble with their CSS should try this to fix their local environment's CSS.
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:
npm run gulpfrom thestatic/bluebutton-cssfolderAs a dev WITHOUT CSS issues:
npm run gulpfrom thestatic/bluebutton-cssfolderWhat Security Implications Does This PR Have?
Please indicate if this PR does any of the following:
security engineer's approval.
Any Migrations?
etc)