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

Update styles with R2 test findings #561

Merged
merged 9 commits into from
Nov 29, 2021
Merged

Update styles with R2 test findings #561

merged 9 commits into from
Nov 29, 2021

Conversation

rocketnova
Copy link
Contributor

Ticket

Resolves #560

Changes

  • Replaces cagov.font-only.css with cagov.core.css in order to pull in default styles
  • Adds EDD's custom.css that includes their brand overrides of the base cagov brand styles
  • Replaces colorscheme-oceanside.min.css with non minified verion for easier debugging (next will minify anyway)
  • Changes to prevent linked files in EDD css files from breaking compilation:
    • Moves styles/ under public
    • Adds additional EDD font files
    • Adds fancybox/ images

Context

Please ignore changes to claim-status.json. Merge this PR after #559.

Although the desired effect is to update the on-page link styles, pulling in the upstream base css files makes CST more consistent with UIO for minimal effort.

Testing

Visual comparison needed. May want to tag in @nicoleslaw

Comment on lines +2 to +4
@import './cagov.core.css';
@import './colorscheme-oceanside.css';
@import './custom.css';
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note: these are the substantive changes to this file. Other changes are auto-lint changes.

@rocketnova rocketnova linked an issue Nov 24, 2021 that may be closed by this pull request
1 task
@rocketnova rocketnova changed the title Use EDD brand template styles Update styles with R2 test findings Nov 25, 2021
@@ -2,7 +2,7 @@
* Preview.js is loaded in the Canvas tab, the “preview” iframe that renders your components in isolation. Use preview.js
* for global code (such as CSS imports or JavaScript mocks) that applies to all stories.
*/
import '../styles/globals.scss'
import '../public/styles/globals.scss'
Copy link
Contributor

Choose a reason for hiding this comment

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

@rocketnova I added this in a new commit, but I think its trivial enough that I'm approving & merging

@lomky lomky merged commit d88d36f into future Nov 29, 2021
@lomky lomky deleted the rocket/560-r2-styles branch November 29, 2021 20:18
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.

R2 Testing Fixes - 11/24 call - Link styles
2 participants