Skip to content

Commit

Permalink
update to USWDS 2.7
Browse files Browse the repository at this point in the history
* ensure to include custom components in uswds-custom-theme-styles
* update uncss
* remove unused .build.sh
  • Loading branch information
ryanwoldatwork authored Jun 18, 2020
1 parent 26ce0ac commit adef792
Show file tree
Hide file tree
Showing 71 changed files with 3,774 additions and 466 deletions.
8 changes: 8 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.14.1
ignore: {}
# patches apply the minimum changes required to fix a vulnerability
patch:
SNYK-JS-LODASH-567746:
- gulp-sass > lodash:
patched: '2020-06-10T08:52:08.157Z'
2 changes: 1 addition & 1 deletion _sass/_uswds-theme-color.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.4.0
USWDS 2.7.0
----------------------------------------
COLOR SETTINGS
----------------------------------------
Expand Down
15 changes: 14 additions & 1 deletion _sass/_uswds-theme-components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.4.0
USWDS 2.7.0
----------------------------------------
COMPONENT SETTINGS
----------------------------------------
Expand Down Expand Up @@ -38,6 +38,19 @@ $theme-button-border-radius: "md";
$theme-button-small-width: 6;
$theme-button-stroke-width: 2px;

// Card
$theme-card-border-color: "base-lighter";
$theme-card-border-radius: "lg";
$theme-card-border-width: 2px;
$theme-card-gap: 2;
$theme-card-flag-min-width: "tablet";
$theme-card-flag-image-width: "card-lg";
$theme-card-font-family: "body";
$theme-card-header-typeset: "heading", "lg", 2;
$theme-card-margin-bottom: 4;
$theme-card-padding-perimeter: 3;
$theme-card-padding-y: 2;

// Footer
$theme-footer-font-family: "body";

Expand Down
2 changes: 1 addition & 1 deletion _sass/_uswds-theme-general.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.4.0
USWDS 2.7.0
----------------------------------------
GENERAL SETTINGS
----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion _sass/_uswds-theme-spacing.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.4.0
USWDS 2.7.0
----------------------------------------
SPACING SETTINGS
----------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions _sass/_uswds-theme-typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.4.0
USWDS 2.7.0
----------------------------------------
TYPOGRAPHY SETTINGS
----------------------------------------
Expand Down Expand Up @@ -167,7 +167,7 @@ $theme-font-type-lang: false;
$theme-font-type-mono: "roboto-mono";

// sans-serif
$theme-font-type-sans: "public-sans";
$theme-font-type-sans: "source-sans-pro";

// serif
$theme-font-type-serif: "merriweather";
Expand Down Expand Up @@ -320,8 +320,8 @@ Or use `false` for unneeded weights.
*/

$theme-font-weight-thin: false;
$theme-font-weight-light: 200;
$theme-font-weight-normal: 300;
$theme-font-weight-light: 300;
$theme-font-weight-normal: 400;
$theme-font-weight-medium: false;
$theme-font-weight-semibold: false;
$theme-font-weight-bold: 700;
Expand Down
2 changes: 1 addition & 1 deletion _sass/_uswds-theme-utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
========================================
========================================
----------------------------------------
USWDS 2.4.0
USWDS 2.7.0
----------------------------------------
UTILITIES SETTINGS
----------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions _sass/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,19 @@
// @import 'packages/usa-alert';
// @import 'packages/usa-banner';
// @import 'packages/usa-button';
// @import 'packages/usa-button-group';
// @import 'packages/usa-card';
// @import 'packages/usa-checklist';
// @import 'packages/usa-footer';
// @import 'packages/usa-header';
// @import 'packages/usa-hero';
// @import 'packages/usa-layout';
// @import 'packages/usa-media-block';
// @import 'packages/usa-megamenu';
// @import 'packages/usa-nav-container';
// @import 'packages/usa-nav';
// @import 'packages/usa-navbar';
// @import 'packages/usa-section';
// @import 'packages/usa-search';
// @import 'packages/usa-sidenav';
// @import 'packages/usa-skipnav';
Expand Down
11 changes: 7 additions & 4 deletions assets/uswds/css/styles.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/uswds/css/styles.css.map

Large diffs are not rendered by default.

Binary file modified assets/uswds/fonts/public-sans/PublicSans-Black.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Black.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Black.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-BlackItalic.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-BlackItalic.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-BlackItalic.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Bold.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Bold.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Bold.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-BoldItalic.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-BoldItalic.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-BoldItalic.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraBold.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraBold.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraBold.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraBoldItalic.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraBoldItalic.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraBoldItalic.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraLight.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraLight.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraLight.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraLightItalic.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraLightItalic.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ExtraLightItalic.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Italic.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Italic.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Italic.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Light.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Light.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Light.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-LightItalic.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-LightItalic.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-LightItalic.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Medium.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Medium.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Medium.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-MediumItalic.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-MediumItalic.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-MediumItalic.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Regular.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Regular.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Regular.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-SemiBold.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-SemiBold.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-SemiBold.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-SemiBoldItalic.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-SemiBoldItalic.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-SemiBoldItalic.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Thin.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Thin.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-Thin.woff2
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ThinItalic.ttf
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ThinItalic.woff
Binary file not shown.
Binary file modified assets/uswds/fonts/public-sans/PublicSans-ThinItalic.woff2
Binary file not shown.
Loading

0 comments on commit adef792

Please sign in to comment.