Skip to content

[Beta] Use SASS modules#4539

Merged
thisisdano merged 81 commits into
library--developfrom
library--develop-sass-modules
Mar 3, 2022
Merged

[Beta] Use SASS modules#4539
thisisdano merged 81 commits into
library--developfrom
library--develop-sass-modules

Conversation

@mejiaj

@mejiaj mejiaj commented Feb 24, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Convert to SASS modules. This release adds SASS modules to USWDS beta (currently based on 2.12.2). Closes #4357.

Additional information

  • Bulk of the work was done in core to ensure functions (color especially), mixins, placeholders, settings, tokens, and variables work as expected
  • Components now use SASS module syntax
  • Old import style still works

⚠️ Updating shouldn't require any changes from user.

Before you hit Submit, make sure you’ve done whichever of these applies to you:

  • Follow the 18F Front End Coding Style Guide and Accessibility Guide.
  • Run npm test and make sure the tests for the files you have changed have passed.
  • Run your code through HTML_CodeSniffer and make sure it’s error free.
  • Title your pull request using this format: [Website] - [UI component]: Brief statement describing what this pull request solves.

James Mejia added 30 commits December 22, 2021 14:27
Fix typo in comment
f50216b
Add initial variables.
7624f88
Tokens: add colors.
60e5deb
Tokens: add type.
8cb2e64
Tokens: add grid and spacing.
a5e2328
Tokens: add entrypoint.
75da322
Functions: add units.
cffbf1b
Functions: add math.
f1d2509
Functions: add comment to remove Pow() in the future.
5947b43
Functions: add grid.
a2c38de
Functions: add general.
cf98fdb
Functions: add output.
a2a1a5a
Functions: add font.
0418dbd
Functions: add utilities.
83d1f09
Tokens: Change $tokens-color-required → $tokens-color-global.
8fb322e
Utils: Add color palettes.
0a4a29c
Utils: Add default, font, spacing, and registry palettes.
69b887b
Utils: use map.get
647b8b3
Move settings files to core.
eeebd9c
Functions: Update etc functions.
d94618a 
- Add error-not-token
- Add debug tests
Functions: Update error-not-token in color().
f3f1997
Functions: Update error-not-token in lh().
cb8593f
Functions: Update error-not-token in utility-font().
4fcd3f5
Functions: Use individual functions in ns().
0ecb63c
Functions: add missing libraries to grid functions.
3f1ea1f
Functions: add missing imports to unit functions.
4ba2ea8
Functions: fix color() return value.
7e38a39
Functions: General function cleanup.
72a2405
Functions: Use error-not-token().
e1a9c1a
Functions: Add updated color functions.
19f8a5b
James Mejia added 22 commits February 4, 2022 12:14
[Test] Add set-theme-color.
8c4c4c8
Update color() imports
b34c2ef
Use uswds core in summary box component.
17a4067
Color fixes; mainly use set-theme-color.
1cdb3fe
to-number(); use warn instead of log.
3fa4fce
SASS Core: update imports.
891e1dd
Colors: use set-theme-color() in project color vars.
aa10635
Components: add sass built-in modules.
cdb1ebe
Functions: fix imports.
23e998b
Merge branch 'library--develop' of github.com:uswds/uswds into librar…
0949608 
…y--develop-sass-modules
Move alert slim styles to alert component.
6a6a0c8
Rename site alert icon object to remove conflict.
c5b71ab
Fix dependency issues in alerts and site alerts.
e699a3c 
- Move all alert related mixins to `alert-statius-styles`
- Move all shared variables to `project-alerts` file
- Remove settings and mixins from Alerts (this previously powered site-alert styles too and was causing the issue)
Run prettier.
0962b50
Merge branch 'library--develop' of github.com:uswds/uswds into librar…
030a6b6 
…y--develop-sass-modules
Uncomment component code.
7437d7b
Add missing reference in set-link-from-bg.
6e17847
Include settings in get-color-token-from-bg.
f4d65a9
Use gulp-sass to compile.
2e4e6db
Functions: add missing imports and update order of vars.
d4efea2
Make $error-output-override public
c76693a
Components: move uswds-typography up.
941f600
@mejiaj mejiaj marked this pull request as ready for review February 28, 2022 15:15
mejiaj
mejiaj commented Feb 28, 2022
View reviewed changes
Comment thread src/stylesheets/core/_index.scss
@forward "settings";
@forward "variables";
// @TODO is defaults necessary?
// @forward "defaults";

@mejiaj mejiaj Feb 28, 2022

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.

Defaults might not even be necessary. I'm not sure what the purpose of this is originally.

@aduth aduth mentioned this pull request Feb 28, 2022
Closed
thisisdano
thisisdano approved these changes Mar 3, 2022
View reviewed changes

@thisisdano thisisdano 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.

😅

@thisisdano thisisdano merged commit 060c6ac into library--develop Mar 3, 2022
@thisisdano thisisdano deleted the library--develop-sass-modules branch March 3, 2022 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@amyleadem amyleadem Awaiting requested review from amyleadem
1 more reviewer
@thisisdano thisisdano thisisdano approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mejiaj @thisisdano