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.0 #3017

Merged
merged 2,025 commits into from Apr 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2025 commits
Select commit Hold shift + click to select a range
1e60294
Use single hyphen in external-link
thisisdano Feb 23, 2019
68d9e38
Use usa-dark-background not usa-background-dark to avoid variant ambi…
thisisdano Feb 23, 2019
fed1b80
Add basic link styles to unstyled button
thisisdano Feb 23, 2019
bf85e8c
Explicitly style link examples
thisisdano Feb 23, 2019
f37ae8b
Add explicit styling to footer links
thisisdano Feb 23, 2019
4057113
Update global styles [see description]
thisisdano Feb 23, 2019
f13dbd3
Fix linting
thisisdano Feb 23, 2019
fa9c091
Add explicit link style to alert and scope to text
thisisdano Feb 23, 2019
8b57c7b
Use explicit link styling in forms
thisisdano Feb 23, 2019
2c40bec
Add explicit state color styling to menu button
thisisdano Feb 23, 2019
7c23010
Remove text-decoration from nav button
thisisdano Feb 23, 2019
8d99821
Fix improper semicolons
thisisdano Feb 23, 2019
917d806
Sync settings files
thisisdano Feb 23, 2019
a911942
Update readme to describe BEM
thisisdano Feb 24, 2019
758c7e5
Remove font-definitions from packages
thisisdano Feb 24, 2019
77ee7fe
Merge pull request #2922 from uswds/dw-fix-packages--fonts
thisisdano Feb 24, 2019
818cfef
Merge branch 'release-2.0' into dw-variant-naming
thisisdano Feb 24, 2019
2ad06db
Merge branch 'release-2.0' into dw-update-prose-scope
thisisdano Feb 24, 2019
89c136a
Update settings version to beta 6
thisisdano Feb 25, 2019
82aaf4b
add white arrow ui assets
Feb 25, 2019
a7aa95a
Don't combine modifiers: use multiple modifiers for outline.inverse
thisisdano Feb 25, 2019
5fc980b
add white down arrow
Feb 25, 2019
631271a
Add a new var to control if layout grid gets !important
thisisdano Feb 25, 2019
715b9b9
Merge pull request #2923 from uswds/sg-header-arrow
thisisdano Feb 25, 2019
6249b8a
Merge pull request #2904 from uswds/dw-variant-naming
thisisdano Feb 26, 2019
ac4b568
Add closing div to outline inverse buttons
maya Mar 6, 2019
c008e38
Use expanded style
thisisdano Mar 7, 2019
3944c48
Use correct name for content styles description
thisisdano Mar 7, 2019
fed7008
Merge branch 'release-2.0' into dw-update-prose-scope
thisisdano Mar 7, 2019
32c3e8f
Update var name for consistency
thisisdano Mar 7, 2019
e523598
Merge pull request #2924 from uswds/dw-grid-important
Mar 7, 2019
f3cf61e
Merge pull request #2926 from uswds/add-closing-div-btns
thisisdano Mar 7, 2019
3d0ebd5
Merge pull request #2921 from uswds/dw-update-prose-scope
Mar 7, 2019
eada16f
Change button background to background-color
maya Mar 8, 2019
1307afc
Ensure tagline section appears and remove heading top margins
maya Mar 8, 2019
6930c03
Remove top and bottom margins from headings
Mar 8, 2019
d795404
Update external link to hyphen
maya Mar 9, 2019
c7eeab5
Fix hero headig alt class name
maya Mar 9, 2019
1725956
Remove underline
thisisdano Mar 10, 2019
4aafd45
Show/hide proper text in banner
thisisdano Mar 10, 2019
024723d
Merge pull request #2933 from uswds/dw-accordion-button
thisisdano Mar 10, 2019
ba0fcb8
Add new versions of Merriweather and Source from google fonts
thisisdano Mar 10, 2019
dc88ab4
Update _system-tokens.scss
thisisdano Mar 10, 2019
fc283d1
Update LICENSE.md
thisisdano Mar 10, 2019
98bc6bb
Update license to include the Latin set used
thisisdano Mar 10, 2019
8645481
Add information about generated formats
thisisdano Mar 10, 2019
c235143
Upgrade to gulp 4
saracope Mar 11, 2019
9d4139e
Use BEM for external link; use modular link--alt
thisisdano Mar 11, 2019
ecdc709
Remove stray extra line
thisisdano Mar 11, 2019
630855c
Merge pull request #2930 from uswds/update-button-background
thisisdano Mar 11, 2019
46f4695
Update beta.5 -> beta.6 in README
thisisdano Mar 11, 2019
92e1bf9
Merge pull request #2932 from uswds/fix-external-link
Mar 11, 2019
13881ab
2.0.0-beta.6
thisisdano Mar 11, 2019
441a393
Upgrade vinyl-source-stream to 2.0
saracope Mar 11, 2019
c231bf1
Merge pull request #2935 from uswds/release-2.0.0-beta.6
Mar 11, 2019
ddb91b9
Changes for gulp v4
saracope Mar 11, 2019
d611135
Update landing-inner.njk
Mar 11, 2019
8ceaef2
Update sass build
saracope Mar 11, 2019
764cf02
Update dark background text name
maya Mar 11, 2019
d6dedc5
Merge pull request #2937 from uswds/fix-dark-bg-classname
thisisdano Mar 11, 2019
b1a2d23
Merge pull request #2931 from uswds/fix-landing-page
thisisdano Mar 11, 2019
629f130
Merge pull request #2936 from uswds/fix-hero-heading-class
thisisdano Mar 11, 2019
7d003bd
Remove (deprecated) gulp-clean
saracope Mar 11, 2019
7e5eb0c
Update fonts to most recent versions in GitHib repos / Subset Latin
thisisdano Mar 11, 2019
db231df
Update non-BEM class
thisisdano Mar 11, 2019
27610b9
Remove (deprecated) gulp-util
saracope Mar 11, 2019
93f68fd
Remove left margin for alignment
thisisdano Mar 11, 2019
ef8812a
Use BEM underscaores in mixin
thisisdano Mar 11, 2019
5177d41
Merge pull request #2941 from uswds/dw-footer-links
Mar 11, 2019
a7859a3
Update gulp-filter to 5.1.0
saracope Mar 11, 2019
9817ac5
Update gulp-sass to 4.0.2
saracope Mar 11, 2019
4dc7d77
Rewrite mixin to add proper prefix based on usage
thisisdano Mar 11, 2019
ae4de0e
Add left margin to align with the section heading
thisisdano Mar 11, 2019
29c7fef
Use alpha order for rules
thisisdano Mar 11, 2019
0607bc3
Update gulp-mocha & mocha
saracope Mar 11, 2019
8b2ba26
Update gulp-stylelint
saracope Mar 11, 2019
6d8a6ec
Merge pull request #2943 from uswds/dw-align-mobile-footer-links
Mar 12, 2019
bee8aac
Merge pull request #2942 from uswds/dw-sidenav-dividers
Mar 12, 2019
3b6edfc
Reduce icon size of slim alert
maya Mar 12, 2019
1151be0
Capitalize L
maya Mar 12, 2019
3c634e4
Capitalize L
maya Mar 12, 2019
75dd0cf
Use sentence case headings and correct some words
maya Mar 12, 2019
a171b89
Update media link class name
maya Mar 12, 2019
f9ad846
Use BEM naming convention for radio and checkbox
maya Mar 12, 2019
3677e51
Add system font metadata to typeface tokens
thisisdano Mar 12, 2019
7fc5516
Output display name in font stack conditionally [see details]
thisisdano Mar 12, 2019
17fd81f
Add function comments
thisisdano Mar 12, 2019
e1e44d0
Use 'Helvetica Neue' as helvetica's display name
thisisdano Mar 12, 2019
264d8bb
Package updates and removing redundant build script
saracope Mar 12, 2019
b0c4e76
Syntax updates
saracope Mar 12, 2019
31d98ca
Remove run-sequence
saracope Mar 12, 2019
d5added
Update gulp-cli to 2.0.1
saracope Mar 12, 2019
15bf2a6
Update gulp-postcss to 8.0.0
saracope Mar 12, 2019
21fa360
Merge pull request #2946 from uswds/update-slim-alert-icon
thisisdano Mar 12, 2019
b8f2efe
Update gulp-sourcemaps and gulp-replace
saracope Mar 12, 2019
dc4184a
Merge pull request #2947 from uswds/dw-fix-font-stacks
Mar 12, 2019
1aaaf22
Add working print styles to radio input
thisisdano Mar 12, 2019
008ce6c
Merge pull request #2950 from uswds/dw-input-print-styles
Mar 12, 2019
ce31bea
Fix merge conflict
maya Mar 12, 2019
d09a4f7
Add block name to radio/checkbox list element
maya Mar 12, 2019
380bf9a
Update _figure.scss
Mar 12, 2019
ed7ffac
Merge pull request #2952 from uswds/update-radio-bem
thisisdano Mar 12, 2019
bd89c40
Merge pull request #2951 from uswds/update-media-link
thisisdano Mar 12, 2019
25473d5
Update/remove deprecated stylelint rules
saracope Mar 12, 2019
169aa7f
Fix stylelint errors
saracope Mar 12, 2019
7704a09
Force Mocha to quit after tests complete
saracope Mar 12, 2019
e7053ca
Update gulp-mocha & mocha
saracope Mar 12, 2019
8506935
Update template to show unstyled variant
thisisdano Mar 13, 2019
76ee144
Add more overrides
thisisdano Mar 13, 2019
97691ea
Add unstyled variants to other button classes
thisisdano Mar 13, 2019
e8fa765
Update todos
thisisdano Mar 13, 2019
304a116
Show unstyled variant for button--big
thisisdano Mar 14, 2019
489d558
Use inverse colors for unstyled.inverse
thisisdano Mar 14, 2019
9f92278
Updated list markup to use BEM
thisisdano Mar 14, 2019
5d7761c
Add an unstyled list example
thisisdano Mar 14, 2019
7bf5f45
Update footer styles to use BEM
thisisdano Mar 14, 2019
cda366a
Added ustyled list BEM styles and moved line height to the list level…
thisisdano Mar 14, 2019
ec967a6
Fix filter expression
adborden Mar 14, 2019
d03b21a
Merge pull request #2958 from adborden/adborden/sc_gulp-upgrade
Mar 14, 2019
9da5fc2
Merge pull request #2957 from uswds/sc_gulp-upgrade
Mar 14, 2019
a9e8cce
Remove left padding from usa-alert--no-icon body
Mar 14, 2019
00e2ed9
Remove extra whitespace
maya Mar 14, 2019
d1f904f
Show no icon variant, remove extra line break, update package-lock.json
maya Mar 14, 2019
65e6be8
npm audit fixes
saracope Mar 15, 2019
b101d73
Update browserify to 16.2.3
saracope Mar 15, 2019
c98cf52
add sara to contributor list
saracope Mar 15, 2019
5c16010
adding stephanie to contributors list
saracope Mar 15, 2019
030e9ed
Merge pull request #2959 from uswds/mb-fix-alert-no-icon
thisisdano Mar 15, 2019
945cdd5
Most gulp-postcss and remove natives
thisisdano Mar 15, 2019
913d7dd
Update package-lock.json
thisisdano Mar 15, 2019
7ad8e5d
Merge pull request #2961 from uswds/dw-update-gulp-deps
Mar 15, 2019
dca8b03
Update package-lock.json
thisisdano Mar 18, 2019
8b7b56c
Use transparent as bg for outline buttons
thisisdano Mar 18, 2019
d4fc62d
Merge branch 'release-2.0' into dw-update-unstyled-classes
thisisdano Mar 18, 2019
275f10b
Update package-lock.json
thisisdano Mar 18, 2019
ece050c
Merge pull request #2963 from uswds/sc_package-updates
Mar 18, 2019
94616ac
Update measure tokens to ex units and add measure-6
thisisdano Mar 18, 2019
5d3f106
Update settings to new measure values
thisisdano Mar 18, 2019
cf9a862
Update docs to use proper values
thisisdano Mar 18, 2019
72e8172
Merge branch 'release-2.0' into dw-update-measure
thisisdano Mar 18, 2019
741d179
Tighten the letterspacing of `letterspacing 1`
thisisdano Mar 18, 2019
26210b7
Merge pull request #2964 from uswds/dw-update-measure
Mar 18, 2019
637b3ba
Merge pull request #2965 from uswds/dw-update-letterspacing
Mar 18, 2019
22d0304
Move browserify to devDeps
thisisdano Mar 18, 2019
c95723d
Merge pull request #2967 from uswds/dw-patch-deps
Mar 18, 2019
b1f0051
Update node and npm versions in README
Mar 18, 2019
f65e9fb
Update README.md
Mar 18, 2019
e7c49cd
Update error message - BEM
maya Mar 19, 2019
f26f7f4
Update label required
maya Mar 19, 2019
032d37a
Update hint text
maya Mar 19, 2019
9aade5d
Remove content list class
maya Mar 19, 2019
676b584
Update intro text - BEM
maya Mar 19, 2019
4fbbf4f
Update js nav class - BEM
maya Mar 19, 2019
566e283
Remove usa-input-list and lists from radio/checkboxes, fix multicolum…
maya Mar 19, 2019
c361580
Change hero heading to h1
Mar 19, 2019
81f3b35
Merge branch 'release-2.0' into dw-update-unstyled-classes
thisisdano Mar 20, 2019
64c623d
Remove todo
thisisdano Mar 20, 2019
ea52539
Update btn unstyled mixin and remove CSS nesting
maya Mar 20, 2019
82b661b
Merge pull request #2976 from uswds/mb-update-btn-unstyled
Mar 20, 2019
e3b93f9
Merge pull request #2974 from uswds/dw-update-unstyled-classes
Mar 20, 2019
7c410c8
Merge pull request #2973 from uswds/mb-update-hero-heading
saracope Mar 20, 2019
59d71b2
Use new SSP subset and update tokens
maya Mar 20, 2019
980de84
Merge branch 'release-2.0' of github.com:uswds/uswds into dw-update-f…
maya Mar 20, 2019
ede385a
Merge pull request #2968 from uswds/mb-update-readme-node
saracope Mar 20, 2019
8cec21a
Update CircleCI node image to 10.15.1
maya Mar 20, 2019
2a4b767
Use proper font theme palettes
thisisdano Mar 20, 2019
a4f42a7
Merge pull request #2980 from uswds/dw-font-theme-output
Mar 20, 2019
cb06994
Merge pull request #2972 from uswds/mb-update-bem
thisisdano Mar 20, 2019
9943ed5
Update Merriweather cap height
maya Mar 20, 2019
49479c4
Update LICENSE.md
Mar 20, 2019
ee5f7b0
Merge branch 'dw-update-fonts' of github.com:uswds/uswds into dw-upda…
maya Mar 20, 2019
2c2d4ac
Merge pull request #2934 from uswds/dw-update-fonts
Mar 20, 2019
0d3b61c
Use proper name for source sans pro italic
thisisdano Mar 20, 2019
ef3027b
Update package-lock.json
maya Mar 20, 2019
e3c9f07
Force update cache
maya Mar 20, 2019
4b01630
Fix typo in radio buttons
thisisdano Mar 20, 2019
f30325f
Remove grid container from sidenav example
thisisdano Mar 20, 2019
d5c8e4a
Use 72ex for measure-5
thisisdano Mar 20, 2019
b62dbc3
Merge pull request #2981 from uswds/dw-72ex
Mar 20, 2019
769e24d
Update Public Sans
thisisdano Mar 21, 2019
0c05e1a
Merge pull request #2979 from uswds/mb-update-circleci-node
saracope Mar 22, 2019
ee238b5
add snyk monitor to deploy in circleci
saracope Mar 22, 2019
cf5386d
Update Public Sans [92 weight for normal]
thisisdano Mar 22, 2019
afeca5d
Update favicon to use new logo
thisisdano Mar 22, 2019
e6bc661
Make icon a little bigger
thisisdano Mar 22, 2019
2297ad5
Darken to render better in dark mode tabs
thisisdano Mar 22, 2019
5491a85
Revert to lighter black
thisisdano Mar 22, 2019
7c0c796
Use flag image in banner, not favicon
thisisdano Mar 22, 2019
717ff86
Merge pull request #2985 from uswds/dw-update-favicon
Mar 22, 2019
067dc20
Update license with correct reference to Libre Franklin
thisisdano Mar 23, 2019
55aa0dd
Update version number refs
thisisdano Mar 24, 2019
07e26aa
Constrain focus to tabbable elements [IE 11 fix]
thisisdano Mar 25, 2019
0cf18d8
Remove EOT and SVG font versions
thisisdano Mar 25, 2019
d3921bd
Remove EOT reference from font-face builder
thisisdano Mar 25, 2019
e4b89fd
Remove eot examples from settings docs
thisisdano Mar 25, 2019
01211ad
Remove paragraph alert from components
thisisdano Mar 25, 2019
5db5334
Remove paragraph alert Sass
thisisdano Mar 25, 2019
da2f122
Remove paragraph alert settings
thisisdano Mar 25, 2019
b293e64
Improve mobile margin between list examples
thisisdano Mar 25, 2019
0079316
Merge pull request #2988 from uswds/dw-update-focus
Mar 25, 2019
82ea008
Merge pull request #2989 from uswds/dw-remove-eot
Mar 25, 2019
7e07140
Merge pull request #2990 from uswds/dw-remove-alert-paragraph
Mar 25, 2019
6c164aa
Merge pull request #2986 from uswds/dw-update-public-sans-license
Mar 25, 2019
951b728
Merge pull request #2984 from uswds/sc_snyk-monitoring
Mar 25, 2019
d1028e6
2.0.0-beta.7
thisisdano Mar 25, 2019
b452b4f
Improve validation design
maya Mar 25, 2019
191f0d6
Remove extra line break
maya Mar 25, 2019
dac5f35
Add validation to pw form and update css
maya Mar 25, 2019
36e2e12
Add text decoration none to accordion hover
Mar 25, 2019
3eba7ca
Update icon colors
maya Mar 25, 2019
beeec06
Remove text decoration from nav buttons
maya Mar 25, 2019
836da16
Merge pull request #2996 from uswds/mb-update-accordion-hover
thisisdano Mar 25, 2019
2631bc1
Remove margin above accordion content
thisisdano Mar 25, 2019
5fefee2
Merge pull request #3000 from uswds/dw-fix-accordion-gap
Mar 26, 2019
8c7e611
Add 1.x support docs to README
Mar 26, 2019
82e1f55
Update README.md
Mar 26, 2019
6593dd0
Update README.md
Mar 26, 2019
78ac7ca
Merge pull request #3002 from uswds/mb-add-1.x-support-docs
thisisdano Mar 26, 2019
b505f3c
Merge branch 'release-2.0' of github.com:uswds/uswds into update-icon…
maya Mar 27, 2019
9e0808a
Update package-lock.json
maya Mar 27, 2019
7b174ab
Update image colors
maya Mar 27, 2019
4cd1f8f
Update gov banner colors to 2.0 palette
maya Mar 27, 2019
58de592
Update banner icon to non vivid variant for icon
maya Mar 27, 2019
370debb
Remove extra period
Mar 27, 2019
4487300
Update _add-checkbox-placeholder.scss
maya Mar 27, 2019
3a27d74
Remove PNG fallback from background image mixin
maya Mar 27, 2019
1426215
Merge pull request #2999 from uswds/master
thisisdano Mar 27, 2019
33b8aea
Merge pull request #2994 from uswds/fix-validation-design
thisisdano Mar 27, 2019
cfc18b2
Remove PNG icons
maya Mar 27, 2019
b86a7b9
Merge pull request #3007 from uswds/update-icon-colors
thisisdano Mar 27, 2019
6cc9087
Allow values of `.5` and `-.5` without leading zeros
Mar 29, 2019
eb7df50
Merge pull request #3008 from dmethvin-gov/no-leading-0
thisisdano Mar 29, 2019
a7cbda2
Merge pull request #3009 from uswds/external-allow-leading-zeros
Apr 1, 2019
241c4cc
Add u-overflow-x() and u-overflow-y() mixins
thisisdano Apr 3, 2019
057ceb1
Fix u-outline() mixin to properly accept strings
thisisdano Apr 3, 2019
a7842f6
Allow outline to accept 1 unit
thisisdano Apr 3, 2019
6e9196b
Update package-lock.json
thisisdano Apr 3, 2019
883a9a2
Revert to disallowing 1 unit in outline
thisisdano Apr 3, 2019
fef190a
Add `offset-none` to the responsive offset loop
thisisdano Apr 4, 2019
6389235
Merge pull request #3014 from uswds/dw-fix-offset-none
Apr 4, 2019
aa3e5bf
Merge pull request #3012 from uswds/dw-utility-mixins
Apr 4, 2019
d9bdaaf
Update Beta refs in readme
thisisdano Apr 4, 2019
c5b574b
Update beta refs in settings headers
thisisdano Apr 4, 2019
c5c5454
Merge pull request #3016 from uswds/dw-update-beta-refs
Apr 4, 2019
db9c0c5
Merge branch 'develop' into release-2.0
thisisdano Apr 4, 2019
81f6757
Remove v1 code
thisisdano Apr 4, 2019
1476f06
Merge branch 'release-2.0' of github.com:uswds/uswds into release-2.0
thisisdano Apr 4, 2019
790d76b
Install snyk before tests on circle
thisisdano Apr 4, 2019
ea7876f
Merge pull request #2991 from uswds/release-2.0
Apr 4, 2019
33c2563
2.0.0
thisisdano Apr 4, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 8 additions & 5 deletions .circleci/config.yml
Expand Up @@ -3,14 +3,14 @@ version: 2
references:
container: &container
docker:
- image: circleci/node:8.10-browsers
- image: circleci/node:10.15.1-browsers
environment:
CHROME_PATH: /usr/bin/google-chrome

restore_deps: &restore_deps
restore_cache:
keys:
- v1-uswds-dependencies-{{ checksum "package-lock.json" }}
- v2-uswds-dependencies-{{ checksum "package-lock.json" }}

jobs:
build:
Expand All @@ -22,12 +22,15 @@ jobs:
command: sudo npm install -g codeclimate-test-reporter
- restore_cache:
keys:
- v1-uswds-dependencies-{{ checksum "package-lock.json" }}
- v2-uswds-dependencies-{{ checksum "package-lock.json" }}
- run: npm install
- save_cache:
paths:
- node_modules
key: v1-uswds-dependencies-{{ checksum "package-lock.json" }}
key: v2-uswds-dependencies-{{ checksum "package-lock.json" }}
- run:
name: Setup Snyk
command: sudo npm install -g snyk
- run:
name: Run test
command: npm test
Expand All @@ -48,7 +51,7 @@ jobs:
- checkout
- restore_cache:
keys:
- v1-uswds-dependencies-{{ checksum "package-lock.json" }}
- v2-uswds-dependencies-{{ checksum "package-lock.json" }}
- run: npm install --ignore-scripts
- run: npm rebuild node-sass
- run:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -4,6 +4,7 @@
# ignore Node-specific files and directories
node_modules/
npm-debug.log*
.gz

# code coverage
coverage/
Expand All @@ -20,3 +21,6 @@ src/stylesheets/lib
# ignore saved screenshots
spec/screenshots/*.png
spec/screenshots/metadata.js

# ignore sass cache
.sass-cache/
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
8
10.15.1
76 changes: 76 additions & 0 deletions .stylelintrc.json
@@ -0,0 +1,76 @@
{
"plugins": [
"stylelint-scss"
],
"rules": {
"at-rule-name-case": "lower",
"at-rule-name-space-after": "always-single-line",
"at-rule-semicolon-newline-after": "always",
"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always-multi-line",
"block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
"block-opening-brace-newline-after": "always-multi-line",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"color-hex-case": "lower",
"color-no-invalid-hex": true,
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-block-no-shorthand-property-overrides": true,
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
"declaration-block-trailing-semicolon": "always",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"declaration-no-important": true,
"function-calc-no-unspaced-operator": true,
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
"function-max-empty-lines": 0,
"function-name-case": "lower",
"function-parentheses-space-inside": "never-single-line",
"function-url-quotes": "always",
"function-whitespace-after": "always",
"indentation": 2,
"length-zero-no-unit": true,
"max-empty-lines": 1,
"max-nesting-depth": 4,
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"media-feature-parentheses-space-inside": "never",
"no-eol-whitespace": true,
"no-extra-semicolons": true,
"no-invalid-double-slash-comments": true,
"number-no-trailing-zeros": true,
"property-case": "lower",
"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-list-comma-space-before": "never",
"selector-max-empty-lines": 0,
"selector-max-id": 0,
"selector-no-qualifying-type": true,
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-parentheses-space-inside": "never",
"selector-pseudo-element-case": "lower",
"selector-pseudo-element-no-unknown": true,
"selector-type-case": "lower",
"string-no-newline": true,
"string-quotes": "single",
"unit-case": "lower",
"value-list-comma-newline-after": "always-multi-line",
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never"
},
"ignoreFiles": "./src/stylesheets/lib/**/*"
}
12 changes: 8 additions & 4 deletions LICENSE.md
Expand Up @@ -2,18 +2,22 @@

### Files licensed under the SIL Open Font License

The Source Sans Pro font files in `src/fonts` are a customized subset of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Adobe Systems Incorporated](http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
The Source Sans Pro font files in `src/fonts/source-sans-pro` are a [customized subset](https://github.com/miguelsousa/source-sans-pro-subset) of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Adobe Systems Incorporated](http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.

The Merriweather font files in `src/fonts` are from [Google Web Fonts](https://www.google.com/fonts#UsePlace:use/Collection:Merriweather:400,300,400italic,700,700italic), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'.
The Merriweather font files in `src/fonts/merriweather` are v2.001 from [GitHub](https://github.com/EbenSorkin/Merriweather/releases/tag/v2.001) subsetted into Latin and with additional formats generated with [Transfonter](https://transfonter.org/), licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'.

The Public Sans font files in `src/fonts/public-sans` are licensed under the [SIL Open Font License](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL). Public Sans is a modification of Libre Franklin, copyright [Impallari Type](www.impallari.com).

The files in `src/img` are from [Font Awesome](http://fontawesome.io/) by Dave Gandy under the [SIL Open Font License 1.1](http://scripts.sil.org/OFL).

### Files licensed under the Apache 2.0 License

The Roboto Mono font files in `src/fonts/roboto-mono` are licensed under the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0).

### Files licensed under the MIT license

The files in `src/stylesheets/lib` are from:

* [Bourbon](http://bourbon.io/), copyright [thoughtbot](https://thoughtbot.com/), inc., under the [MIT license](https://github.com/thoughtbot/neat/blob/master/LICENSE.md).
* [Neat](http://neat.bourbon.io/), copyright [thoughtbot](https://thoughtbot.com/), inc., also under the [MIT license](https://github.com/thoughtbot/neat/blob/master/LICENSE.md).
* [Normalize.css](https://github.com/necolas/normalize.css), copyright Nicolas Gallagher and Jonathan Neal, under the [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).

#### Full license text for the MIT licensed files:
Expand Down