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

Release 2.0.2 #3055

Merged
merged 51 commits into from May 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
d87d65c
Merge pull request #3021 from uswds/master
thisisdano Apr 5, 2019
6c92d49
Add sites using USWDS
maya Apr 7, 2019
4008c2d
Add site
maya Apr 7, 2019
9a30899
Use primary-dark for link hover color
maya Apr 7, 2019
7707bff
Merge pull request #3023 from uswds/mb-update-link-hover-color
thisisdano Apr 9, 2019
70b89cb
Update README.md
jbledevehat Apr 10, 2019
f880975
Add snyk auth step to circle build
maya Apr 10, 2019
626f7ea
Merge pull request #3028 from uswds/add-snyk-auth
thisisdano Apr 10, 2019
69ed042
Merge pull request #3027 from jbledevehat/patch-1
Apr 10, 2019
a0d413d
Change title to display in vars and mixins
maya Apr 12, 2019
c199490
Change max date to 2019 in date input
Apr 15, 2019
98d90d3
Update footer spec template
maya Apr 15, 2019
cfbc33a
Trigger notification
maya Apr 15, 2019
943d117
Add return to promises test functions
maya Apr 15, 2019
e8c938c
Put return on same line as resizeTo
maya Apr 15, 2019
675a4d1
Change class of list selector
maya Apr 15, 2019
8965365
Change name of list function to primary content
maya Apr 15, 2019
1c2b2ae
Merge pull request #3040 from uswds/update-footer-test
thisisdano Apr 15, 2019
80c0f5a
Merge branch 'develop' of github.com:uswds/uswds into update-display-…
maya Apr 15, 2019
c61e22e
Merge branch 'develop' of github.com:uswds/uswds into mb-update-max-date
maya Apr 15, 2019
fc18e17
Merge branch 'develop' of github.com:uswds/uswds into add-sites-showcase
maya Apr 15, 2019
872dbec
Merge pull request #3034 from uswds/update-display-font-var
thisisdano Apr 16, 2019
f575d65
Merge pull request #3037 from uswds/add-sites-showcase
thisisdano Apr 16, 2019
64f3055
Merge pull request #3039 from uswds/mb-update-max-date
thisisdano Apr 16, 2019
486d800
Fix iOS footer collapse
joncasey Apr 26, 2019
f051c8e
Update footer.spec.js
joncasey Apr 26, 2019
2a46ab0
Update footer.spec.js for real this time
joncasey Apr 26, 2019
0abb5e5
Fix eslint warnings
thisisdano May 1, 2019
eedbbfd
Install postcss comments plugin
thisisdano May 1, 2019
cecb73c
Add separate process for minification
thisisdano May 1, 2019
c090a19
Remove unused package
thisisdano May 1, 2019
fb27448
Allow devDependencies in eslint
thisisdano May 1, 2019
e3260e7
Fix remaining eslint error
thisisdano May 1, 2019
c911a94
Lint test.js
thisisdano May 1, 2019
e3c1df3
Fix lint errors in release.js
thisisdano May 1, 2019
126dde6
Remove @import "all" tests
thisisdano May 1, 2019
edcbc4b
Lint javascript.js
thisisdano May 1, 2019
83fb126
Lint all config files and update build script output
thisisdano May 1, 2019
c1b7e3b
Remove unnamed function
thisisdano May 1, 2019
05de61c
Remove console.log items per eslint
thisisdano May 1, 2019
96ff5ed
Fix lint errors
thisisdano May 1, 2019
2b13ed4
Remove extra space
thisisdano May 1, 2019
cb9b8b6
Merge pull request #3050 from uswds/dw-standard-css
thisisdano May 1, 2019
65fdf7a
Merge pull request #3047 from joncasey/patch-1
thisisdano May 6, 2019
d6defd8
Merge pull request #3052 from uswds/ext-fix-ios-footer
thisisdano May 6, 2019
3f0d1a2
Add new public sans v1.002
thisisdano May 6, 2019
54ae1fa
Merge pull request #3053 from uswds/dw-add-public-sans-v1002
thisisdano May 6, 2019
355acfc
Use v1.003
thisisdano May 7, 2019
f276759
Add v1.003
thisisdano May 7, 2019
e78bfd6
Merge pull request #3054 from uswds/dw-add-public-sans-v1002
thisisdano May 8, 2019
2a50afd
2.0.2
thisisdano May 8, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .circleci/config.yml
Expand Up @@ -31,6 +31,9 @@ jobs:
- run:
name: Setup Snyk
command: sudo npm install -g snyk
- run: # run snyk auth - authenticate snyk use environment variables to add token
name: snyk auth
command: snyk auth $SNYK_TOKEN
- run:
name: Run test
command: npm test
Expand Down
4 changes: 4 additions & 0 deletions .eslintrc.yml
Expand Up @@ -5,3 +5,7 @@ env:
node: true
browser: true
es6: true
rules:
import/no-extraneous-dependencies:
- error
- devDependencies: true
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -37,7 +37,7 @@ This repository is for the design system code itself. We maintain [another repos

## Background

USWDS components and style guide follow industry-standard accessibility guidelines and use the best practices of existing style libraries and modern web design. The [U.S. Digital Service](https://www.whitehouse.gov/digital/united-states-digital-service) and [18F](https://18f.gsa.gov/) created USWDS for designers and developers. USWDS is a project of GSA’s [Technology Transformation Service](https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services), maintained by the Office of Products and Programs. They are designed for use by government product teams who want to create beautiful, easy-to-use online experiences for the public. To learn more about the project, check out this [blog post](https://18f.gsa.gov/2015/09/28/web-design-standards/) and to view websites and applications check out our list [here](docs/WHO_IS_USING_USWDS.md).
USWDS components and style guide follow industry-standard accessibility guidelines and use the best practices of existing style libraries and modern web design. The [U.S. Digital Service](https://www.usds.gov/) and [18F](https://18f.gsa.gov/) created USWDS for designers and developers. USWDS is a project of GSA’s [Technology Transformation Service](https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services), maintained by the Office of Products and Programs. They are designed for use by government product teams who want to create beautiful, easy-to-use online experiences for the public. To learn more about the project, check out this [blog post](https://18f.gsa.gov/2015/09/28/web-design-standards/) and to view websites and applications check out our list [here](docs/WHO_IS_USING_USWDS.md).


## Recent updates
Expand Down Expand Up @@ -119,7 +119,7 @@ How you implement the design system depends on the needs of your project and you
</html>
```

We offer both the CSS and the JavaScript in two versions — minified and un-minified. (In the examples above, we are using the minified files.) Use the minified files in a production environment or to reduce the file size of your downloaded assets. Use the un-minified files if you are in a development environment or would like to debug the CSS or JavaScript assets in the browser.
We offer both the CSS and the JavaScript in two versions — minified and un-minified. (In the examples above, we are using the minified files.) Use the minified files in a production environment or to reduce the file size of your downloaded assets. Use the un-minified files if you are in a development environment or would like to debug the CSS or JavaScript assets in the browser.

And that’s it — you should now be able to copy our code samples into your `index.html` and start using the design system.

Expand Down
36 changes: 17 additions & 19 deletions config/gulp/build.js
@@ -1,49 +1,48 @@
var gulp = require('gulp');
var dutil = require('./doc-util');
var del = require('del');

gulp.task('clean-dist', function (done) {
const gulp = require('gulp');
const del = require('del');
const dutil = require('./doc-util');
const cFlags = require('./cflags');

gulp.task('clean-dist', (done) => {
if (!cFlags.cleanup) {
dutil.logMessage(
'clean-dist',
'Skipping cleaning up the distribution directories.'
'Skipping cleaning up the distribution directories.',
);
return done();
}

dutil.logMessage('clean-dist', 'Removing distribution directories.');

return del('dist');

});

gulp.task('docs', function (done) {

gulp.task('docs', (done) => {
dutil.logMessage('docs', 'Copying documentation dist dir');

var stream = gulp.src([
const stream = gulp.src([
'README.md',
'LICENSE.md',
'CONTRIBUTING.md'
])
'CONTRIBUTING.md',
])
.pipe(gulp.dest('dist'));

done();
return stream;

});


gulp.task('build',
gulp.series(
function (done) {
(done) => {
dutil.logIntroduction();
dutil.logMessage(
'build',
'Creating distribution directories.'
'Creating distribution directories.',
);
done();
},
'clean-dist',
},
'clean-dist',
'docs',
gulp.parallel(
'sass',
Expand All @@ -54,5 +53,4 @@ gulp.task('build',
// We need to copy the Sass to dist *after* the sass task, to ensure
// that vendor libraries have been copied to the Sass directory first.
'copy-dist-sass',
),
);
));
4 changes: 4 additions & 0 deletions config/gulp/cflags.js
@@ -0,0 +1,4 @@
module.exports = {
test: true,
cleanup: true,
};
90 changes: 35 additions & 55 deletions config/gulp/doc-util.js
@@ -1,122 +1,102 @@
var pkg = require('../../package.json');
var log = require('fancy-log');
var colors = require('ansi-colors');
var notifier = require('node-notifier');
const log = require('fancy-log');
const colors = require('ansi-colors');
const notifier = require('node-notifier');
const pkg = require('../../package.json');

var shellPrefix = '$';
const shellPrefix = '$';

function drawFlag () {

// American Flag in ASCII
//
function drawFlag() {
log(
colors.white('')
colors.white(''),
);
log(
colors.white('* * * * * ========================')
colors.white('* * * * * ========================'),
);
log(
colors.white('* * * * * ========================')
colors.white('* * * * * ========================'),
);
log(
colors.white('* * * * * ========================')
colors.white('* * * * * ========================'),
);
log(
colors.white('* * * * * ========================')
colors.white('* * * * * ========================'),
);
log(
colors.white('==================================')
colors.white('=================================='),
);
log(
colors.white('==================================')
colors.white('=================================='),
);
log(
colors.white('==================================')
colors.white('=================================='),
);
log(
colors.white('')
colors.white(''),
);
}

function notify (title, message, wait) {
function notify(title, message, wait) {
notifier.notify({
title: title,
message: message,
title,
message,
icon: 'src/img/favicons/favicon-192.png',
wait: wait,
wait,
});
}

module.exports = {

pkg: {

name: pkg.name,
version: pkg.version,

},

dirName: pkg.name + '-' + pkg.version,

logIntroduction: function (message) {

message = message || 'U.S. Web Design System';
dirName: `${pkg.name}-${pkg.version}`,

logIntroduction(message) {
const introMessage = message || 'USWDS';
log(
colors.yellow('v' + pkg.version),
message
colors.yellow(`${introMessage} v${pkg.version}`),
);
drawFlag();

},

logCommand: function (name, message) {

logCommand(name, message) {
log(
shellPrefix,
colors.cyan(name),
colors.magenta(message)
colors.magenta(message),
);

},

logHelp: function (name, message) {

logHelp(name, message) {
log(
shellPrefix,
colors.cyan(name),
colors.yellow(message)
colors.yellow(message),
);

},

logData: function (name, message) {

logData(name, message) {
log(
colors.cyan(name),
colors.yellow(message)
colors.yellow(message),
);

},

logError: function (name, message) {

logError(name, message) {
log(
colors.red(name),
colors.yellow(message)
colors.yellow(message),
);
notify(this.dirName + ' gulp ' + name, message, true);

notify(`${this.dirName} gulp ${name}`, message, true);
},

logMessage: function (name, message) {

logMessage(name, message) {
log(
colors.cyan(name),
colors.green(message)
colors.green(message),
);
notify(this.dirName + ' gulp ' + name, message, false);

notify(`${this.dirName} gulp ${name}`, message, false);
},

};
24 changes: 7 additions & 17 deletions config/gulp/flags.js
@@ -1,31 +1,21 @@
var gulp = require('gulp');
var dutil = require('./doc-util');

global.cFlags = {

test: true,
cleanup: true,

};

gulp.task('no-test', function (done) {
const gulp = require('gulp');
const dutil = require('./doc-util');
const cFlags = require('./cflags');

gulp.task('no-test', (done) => {
dutil.logMessage(
'no-test',
'Disabling linting and tests for all assets.'
'Disabling linting and tests for all assets.',
);
cFlags.test = false;
done();

});

gulp.task('no-cleanup', function (done) {

gulp.task('no-cleanup', (done) => {
dutil.logMessage(
'no-cleanup',
'Disabling cleanup of distribution directories.'
'Disabling cleanup of distribution directories.',
);
cFlags.cleanup = false;
done();

});
13 changes: 6 additions & 7 deletions config/gulp/fonts.js
@@ -1,14 +1,13 @@
var gulp = require('gulp');
var dutil = require('./doc-util');
var task = 'fonts';
const gulp = require('gulp');
const dutil = require('./doc-util');

gulp.task(task, function (done) {
const task = 'fonts';

gulp.task(task, (done) => {
dutil.logMessage(task, 'Copying Fonts');

var stream = gulp.src('src/fonts/**/*')
const stream = gulp.src('src/fonts/**/*')
.pipe(gulp.dest('dist/fonts'));

done();
return stream;

});
13 changes: 6 additions & 7 deletions config/gulp/images.js
@@ -1,14 +1,13 @@
var gulp = require('gulp');
var dutil = require('./doc-util');
var task = 'images';
const gulp = require('gulp');
const dutil = require('./doc-util');

gulp.task(task, function (done) {
const task = 'images';

gulp.task(task, (done) => {
dutil.logMessage(task, 'Copying Images');

var stream = gulp.src('src/img/**/*')
const stream = gulp.src('src/img/**/*')
.pipe(gulp.dest('dist/img'));

done();
return stream;

});