Skip to content

Commit b1a3df0

Browse files
humancompanion-usdshumancompanion-usds
authored
Merge branch 'main' into fix-minimal-header-guidance
2 parents ecc9d50 + 0ba92ab commit b1a3df0

File tree

11 files changed

+66
-35
lines changed

11 files changed

+66
-35
lines changed

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ node_modules
99
tmp_remote_assets
1010
src/.jekyll-cache
1111
src/assets/stylesheets/component-library.css
12+
src/assets/stylesheets/core.css
13+
src/assets/stylesheets/mobile-typography.css
14+
src/assets/stylesheets/shame.css
15+
src/assets/stylesheets/uswds-typography.css
16+
src/assets/stylesheets/utilities.css
1217
src/formation.min.css
1318
src/vendor
1419
src/_data/component-docs.json

‎config/gulp/css.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@ gulp.task('copy-web-components-css', function (done) {
1717
return stream;
1818
});
1919

20+
gulp.task('copy-css-library-css', function (done) {
21+
console.log('copying css-library CSS');
22+
var stream = gulp.src('./node_modules/@department-of-veterans-affairs/css-library/dist/stylesheets/*.css')
23+
.pipe(gulp.dest('src/assets/stylesheets/'));
24+
25+
return stream;
26+
});
27+
2028
gulp.task(task, gulp.series(
2129
'copy-formation-css',
22-
'copy-web-components-css'
30+
'copy-web-components-css',
31+
'copy-css-library-css'
2332
));

‎package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
},
2727
"homepage": "https://github.com/department-of-veterans-affairs/vets-design-system-documentation#readme",
2828
"devDependencies": {
29-
"@department-of-veterans-affairs/component-library": "^47.1.0",
29+
"@department-of-veterans-affairs/component-library": "^48.0.2",
3030
"gulp": "^4.0.2",
3131
"gulp-clean": "^0.4.0",
3232
"gulp-rename": "^2.0.0",
@@ -38,9 +38,10 @@
3838
},
3939
"dependencies": {
4040
"@department-of-veterans-affairs/formation": "^11.0.12",
41-
"@department-of-veterans-affairs/css-library": "^0.12.2"
41+
"@department-of-veterans-affairs/css-library": "^0.15.0"
4242
},
4343
"engines": {
4444
"npm": "6.14.8"
45-
}
45+
},
46+
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
4647
}

‎src/_data/tokens/vads-font-primitive.csv

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ vads-font-line-length-5,Primitive,vads-size-line-length-5,,uswds-system-font-lin
1515
vads-font-line-length-6,Primitive,vads-size-line-length-6,88ex,uswds-system-font-line-length-6,88ex,From USWDS.
1616
vads-font-line-length-none,Primitive,vads-size-line-length-none,,uswds-system-font-line-length-none,none,From USWDS.
1717
vads-font-size-2xl,Primitive,vads-font-size-2xl,,uswds-system-font-size-14,40px,
18-
vads-font-size-base,Primitive,vads-font-size-base,17px,uswds-system-font-size-6,17px,
18+
font-size-root,Primitive,font-size-root,16px,uswds-system-font-size-6,16px,
19+
vads-font-size-source-sans-normalized,Primitive,vads-font-size-source-sans-normalized,16.96px,uswds-system-font-size-7,16.96px,
1920
vads-font-size-lg,Primitive,vads-font-size-lg,,uswds-system-font-size-8,20px,
2021
vads-font-size-md,Primitive,vads-font-size-md,,uswds-system-font-size-6,17px,
2122
vads-font-size-sm,Primitive,vads-font-size-sm,,uswds-system-font-size-4,15px,

‎src/_data/tokens/vads-font-semantic.csv

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ vads-font-size-body-large,Semantic,vads-font-size-body-large,uswds-system-font-s
66
vads-font-size-body-lead,Semantic,vads-font-size-body-lead,,,vads-font-size-body-large,Lead font size for body text. For lead paragraphs.,20px
77
vads-font-size-body-medium,Semantic,vads-font-size-body-medium,uswds-system-font-size-6,17px,,Medium body font size,
88
vads-font-size-body-small,Semantic,vads-font-size-body-small,uswds-system-font-size-4,15px,,Smallest body font size,
9-
vads-font-size-eyebrow,Semantic,vads-font-size-eyebrow,,,vads-font-size-base,Eyebrow is an experimental request which adds type above an h1.,17px
9+
vads-font-size-eyebrow,Semantic,vads-font-size-eyebrow,,,vads-font-size-root,Eyebrow is an experimental request which adds type above an h1.,16px
1010
vads-font-size-heading-level-1,Semantic,vads-font-size-heading-level-1,uswds-system-font-size-14,40px,,Heading level 1. h1 value.,
1111
vads-font-size-heading-level-2,Semantic,vads-font-size-heading-level-2,uswds-system-font-size-12,32px,,Heading level 2. h2 value. Was 30px,
1212
vads-font-size-heading-level-3,Semantic,vads-font-size-heading-level-3,uswds-system-font-size-8,20px,,Heading level 3. h3 value.,

‎src/_data/tokens/vads.tokens.json

+17-2
Original file line numberDiff line numberDiff line change
@@ -2814,7 +2814,7 @@
28142814
}
28152815
}
28162816
},
2817-
"vads-font-size-base": {
2817+
"vads-font-size-root": {
28182818
"type": "dimension",
28192819
"value": "{uswds.font.size.uswds-system-font-size-6}",
28202820
"extensions": {
@@ -2829,6 +2829,21 @@
28292829
}
28302830
}
28312831
},
2832+
"vads-u-font-size--source-sans-normalized": {
2833+
"type": "dimension",
2834+
"value": "{uswds.font.size.uswds-system-font-size-7}",
2835+
"extensions": {
2836+
"org.lukasoppermann.figmaDesignTokens": {
2837+
"mode": "Value",
2838+
"collection": "vads-primitives",
2839+
"scopes": [
2840+
"ALL_SCOPES"
2841+
],
2842+
"variableId": "VariableID:562:4293",
2843+
"exportKey": "variables"
2844+
}
2845+
}
2846+
},
28322847
"vads-font-size-lg": {
28332848
"type": "dimension",
28342849
"value": "{uswds.font.size.uswds-system-font-size-8}",
@@ -3228,7 +3243,7 @@
32283243
},
32293244
"vads-label-font-size": {
32303245
"type": "color",
3231-
"value": "{vads-primitives.font.size.vads-font-size-base}",
3246+
"value": "{vads-primitives.font.size.vads-font-size-root}",
32323247
"extensions": {
32333248
"org.lukasoppermann.figmaDesignTokens": {
32343249
"mode": "Mode 1",

‎src/_foundation/color-palette.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
- anchor: Semantic color tokens
66
- anchor: Component color tokens
77
- anchor: Primitive color tokens
8-
- anchor: v1 colors
98
---
109

1110
<h1 id="icons">{{ page.title }}</h1>
@@ -108,4 +107,4 @@ <h3 class="vads-u-border-bottom--1px vads-u-border-color--gray-lighter vads-u-ma
108107
%}
109108
{% endfor %}
110109
</div>
111-
</div>
110+
</div>

‎src/_foundation/utilities/html/font-size.html

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
<h2 class="vads-u-font-size--h4">Sizing by name</h2>
22

33
<div class="vads-l-row">
4-
<div class="vads-l-col usa-bitter">
4+
<div class="vads-l-col vads-u-font-family--serif">
55
<p class="vads-u-font-size--sm">15px .vads-u-font-size--sm</p>
6-
<p class="vads-u-font-size--base">16px .vads-u-font-size--base</p>
6+
<p class="vads-u-font-size--root">16px .vads-u-font-size--root</p>
7+
<p class="vads-u-font-size--source-sans-normalized">&nbsp;<!-- spacer for alignment --></p>
78
<p class="vads-u-font-size--md">17px .vads-u-font-size--md</p>
89
<p class="vads-u-font-size--lg">20px .vads-u-font-size--lg</p>
910
<p class="vads-u-font-size--xl">30px .vads-u-font-size--xl</p>
1011
<p class="vads-u-font-size--2xl">40px .vads-u-font-size--2xl</p>
1112
</div>
12-
<div class="vads-l-col usa-sans">
13+
<div class="vads-l-col vads-u-font-family--sans">
1314
<p class="vads-u-font-size--sm">15px .vads-u-font-size--sm</p>
1415
<p class="vads-u-font-size--base">16px .vads-u-font-size--base</p>
16+
<p class="vads-u-font-size--source-sans-normalized">16.96px .vads-u-font-size--source-sans-normalized</p>
1517
<p class="vads-u-font-size--md">17px .vads-u-font-size--md</p>
1618
<p class="vads-u-font-size--lg">20px .vads-u-font-size--lg</p>
1719
<p class="vads-u-font-size--xl">30px .vads-u-font-size--xl</p>

‎src/_includes/head.html

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
<link rel="stylesheet" href="{{ '/formation.min.css' | prepend: site.baseurl | append: cacheBust }}">
3939
<link rel="stylesheet" href="{{ '/assets/stylesheets/application.css' | prepend: site.baseurl | append: cacheBust }}">
40+
<link rel="stylesheet" href="{{ '/assets/stylesheets/utilities.css' | prepend: site.baseurl | append: cacheBust }}">
4041
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
4142
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
4243

‎src/assets/stylesheets/_layout/_content-wrappers.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
.highlight pre {
2020
margin: 0;
2121
color: $vads-color-base;
22-
font-size: $font-size-base;
22+
font-size: $font-size-root;
2323
line-height: 1.5;
2424
}
2525

‎yarn.lock

+19-21
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@
99
dependencies:
1010
regenerator-runtime "^0.14.0"
1111

12-
"@department-of-veterans-affairs/component-library@^47.1.0":
13-
version "47.1.0"
14-
resolved "https://registry.yarnpkg.com/@department-of-veterans-affairs/component-library/-/component-library-47.1.0.tgz#2162d343b38614057632af42e444c658bf68d908"
15-
integrity sha512-ZKTDY8kiQ3F3i3hL3OLQ+fyv9B4Xi1qQkUnBegu8TC6KjXDNed3PxAuVO+5iJXYi604cgBW72gXYZYbi63ITFQ==
12+
"@department-of-veterans-affairs/component-library@^48.0.2":
13+
version "48.0.2"
14+
resolved "https://registry.yarnpkg.com/@department-of-veterans-affairs/component-library/-/component-library-48.0.2.tgz#01e9a25430c27cfbb67ebffb7b7ec15bf254dfe6"
15+
integrity sha512-2lUryYdaxeP08Z9mT/wYoTsm2rxic5tSdivmp4P3Rg9AT3hvA397TkDYS6Jvvuo5f4bLg0+mOXOI8+aEI0dy4Q==
1616
dependencies:
1717
"@department-of-veterans-affairs/react-components" "28.1.0"
18-
"@department-of-veterans-affairs/web-components" "15.1.0"
18+
"@department-of-veterans-affairs/web-components" "16.0.2"
1919
i18next "^21.6.14"
2020
i18next-browser-languagedetector "^6.1.4"
2121
react-focus-on "^3.5.1"
2222
react-transition-group "^1.0.0"
2323

24-
"@department-of-veterans-affairs/css-library@^0.12.2":
25-
version "0.12.2"
26-
resolved "https://registry.yarnpkg.com/@department-of-veterans-affairs/css-library/-/css-library-0.12.2.tgz#da2554d1d71c1927b7462fa70d9cc8b482f8206e"
27-
integrity sha512-nkrgeEGPWLEuoAfCdfFFPNIWIc9BDnxXZZ3HxZrKjL3yIAgNZYB+gm02JbYUHNXZZfXdfHxseaBY4M5C+Z3Iqg==
24+
"@department-of-veterans-affairs/css-library@^0.15.0":
25+
version "0.15.0"
26+
resolved "https://registry.yarnpkg.com/@department-of-veterans-affairs/css-library/-/css-library-0.15.0.tgz#22aa45ab093c32fb492e7537c287aca28fed4f09"
27+
integrity sha512-JhOUMHpEsuX6echHZEtOOMXa8ULSBR6nqf5HlaXdAnPG/B4kfNNII6VEXXvByuavGVduaL7N0u1LpEpdVlDGig==
2828
dependencies:
2929
"@divriots/style-dictionary-to-figma" "^0.4.0"
30-
"@uswds/uswds" "^3.8.1"
30+
"@uswds/uswds" "^3.9.0"
3131
rimraf "^5.0.5"
3232

3333
"@department-of-veterans-affairs/formation@^11.0.12":
@@ -51,12 +51,11 @@
5151
react-transition-group "1"
5252
recast "^0.14.4"
5353

54-
"@department-of-veterans-affairs/web-components@15.1.0":
55-
version "15.1.0"
56-
resolved "https://registry.yarnpkg.com/@department-of-veterans-affairs/web-components/-/web-components-15.1.0.tgz#ec0a6952a591f9ed0a7d3ddea2211047a3471d71"
57-
integrity sha512-/kUPjVJb+Ira1rekD3suBNDJqYFzW1rsF5xT6d2NLe58kY6JnbMV+/w9KH1fG1uCIaXV5RaKVK0bDjSjMhRxAw==
54+
"@department-of-veterans-affairs/web-components@16.0.2":
55+
version "16.0.2"
56+
resolved "https://registry.yarnpkg.com/@department-of-veterans-affairs/web-components/-/web-components-16.0.2.tgz#d278ad7572220fcf0767944cf6abb73211e22300"
57+
integrity sha512-W3uXYDtIJa//kUVOZqosYHMx54PPVgzwWQtThw/AbdwjGTFWh6p+4DFc+BBpE0j8pRFjgFxtaT01iDPloTRWqg==
5858
dependencies:
59-
"@department-of-veterans-affairs/css-library" "^0.12.2"
6059
"@stencil/core" "4.20.0"
6160
aria-hidden "^1.1.3"
6261
body-scroll-lock "^4.0.0-beta.0"
@@ -96,12 +95,11 @@
9695
resolved "https://registry.yarnpkg.com/@stencil/core/-/core-4.20.0.tgz#221f2b36ab999891560449b02d6915862c435f49"
9796
integrity sha512-WPrTHFngvN081RY+dJPneKQLwnOFD60OMCOQGmmSHfCW0f4ujPMzzhwWU1gcSwXPWXz5O+8cBiiCaxAbJU7kAg==
9897

99-
"@uswds/uswds@^3.8.1":
100-
version "3.8.2"
101-
resolved "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.8.2.tgz#230668293c33f6866995ba9d03d6f42aba251336"
102-
integrity sha512-8sTx/GqlbTwSIK+0AFOGrYdaW1rKVB7Bp0+v9AMVt3I5vPK7CL0+I6vlclSf3U7ysJZeTTdkNS8q89sIAeL+AA==
98+
"@uswds/uswds@^3.9.0":
99+
version "3.10.0"
100+
resolved "https://registry.yarnpkg.com/@uswds/uswds/-/uswds-3.10.0.tgz#f78ab69e26dec0080a92845b3dd1d9ddab26e6e9"
101+
integrity sha512-LWFTQzp4e3kqtnD/Wsyfx9uGTkn5GEpzhscNWJMIsdWBGKtiu96QT99oRJUmcsB6HbGhR0Th0FtlK/Zzx2WghA==
103102
dependencies:
104-
object-assign "4.1.1"
105103
receptor "1.0.0"
106104
resolve-id-refs "0.1.0"
107105

@@ -1898,7 +1896,7 @@ number-is-nan@^1.0.0:
18981896
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
18991897
integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
19001898

1901-
object-assign@4.1.1, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
1899+
object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
19021900
version "4.1.1"
19031901
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
19041902
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==

0 commit comments

Comments
 (0)