Skip to content

Commit f0be889

Browse files
mcnuttandrewmcnuttandrew
committed
apply formatting consistantly
1 parent b51fc96 commit f0be889

File tree

227 files changed

+6229
-6218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+6229
-6218
lines changed

‎404.html‎

Lines changed: 79 additions & 28 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ That's the system running the tests to try to prevent you from breaking the buil
4444

4545
Go to `static/papers/` and add a new paper. One way to start is by copying a previous file. Or, you can use the [`prepare-paper` app](https://idl.uw.edu/prepare-paper/) to fill out a form, download a JSON data file for your publication, and edit it as nedded. If your paper already has an assigned [DOI](https://en.wikipedia.org/wiki/Digital_object_identifier), the prepare app can even load paper metadata for you!
4646

47-
The `web_name` of your paper *must* match the file name for the paper JSON: if your web name is "reactive-vega" you should make a file called `static/papers/reactive-vega.json`. The `web_name` attribute must be unique across all papers.
47+
The `web_name` of your paper _must_ match the file name for the paper JSON: if your web name is "reactive-vega" you should make a file called `static/papers/reactive-vega.json`. The `web_name` attribute must be unique across all papers.
4848

49-
If there are authors who are not yet included in `static/people.json`, you will need to add them to that file. Make sure you get everyone's name right! The `first_name` and `last_name` fields in the paper JSON data must exactly match the corresponding fields in the `people.json` dataset. When adding authors to a paper's JSON file, you should not include `url` or `display_name` fields, as these are copied from `people.json` automatically. Note that you'll also get a warning from the test suite if you have not added people correctly.
49+
If there are authors who are not yet included in `static/people.json`, you will need to add them to that file. Make sure you get everyone's name right! The `first_name` and `last_name` fields in the paper JSON data must exactly match the corresponding fields in the `people.json` dataset. When adding authors to a paper's JSON file, you should not include `url` or `display_name` fields, as these are copied from `people.json` automatically. Note that you'll also get a warning from the test suite if you have not added people correctly.
5050

5151
Speaking of: make sure to run the tests! If you are adding via a pull request (which is absolutely what you should be doing!), then the tests will run automatically on your GitHub branch. Meanwhile, tests will be run for you locally before you are able to commit. You can also run them your self via `yarn test`.
5252

‎package.json‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
11
{
2-
"name": "uwdata.github.io",
3-
"description": "Interactive Data Lab Website",
4-
"homepage": "http://idl.uw.edu/",
5-
"version": "2.0.0",
6-
"private": true,
7-
"license": "UNLICENSED",
8-
"scripts": {
9-
"dev": "vite dev",
10-
"build": "npm run integrity-enforcement && vite build && cp 404.html build/404.html",
11-
"preview": "vite preview",
12-
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
13-
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
14-
"lint": "prettier --check . && eslint .",
15-
"format": "prettier --write .",
16-
"prepare": "husky",
17-
"test": "npm run check && npm run integrity-enforcement && vitest run",
18-
"test:watch": "vitest",
19-
"integrity-enforcement": "vite-node scripts/integrity-enforcement.ts "
20-
},
21-
"devDependencies": {
22-
"@eslint/js": "^9.13.0",
23-
"@sveltejs/adapter-auto": "^3.2.2",
24-
"@sveltejs/adapter-static": "^3.0.2",
25-
"@sveltejs/kit": "^2.5.17",
26-
"@sveltejs/vite-plugin-svelte": "^3.1.1",
27-
"@types/d3-force": "^3.0.10",
28-
"@types/eslint": "^8.56.10",
29-
"@types/markdown-it": "^14.1.1",
30-
"@types/node": "^20.14.7",
31-
"@typescript-eslint/eslint-plugin": "^7.13.1",
32-
"@typescript-eslint/parser": "^7.13.1",
33-
"@vitest/ui": "^1.6.0",
34-
"ajv": "^8.16.0",
35-
"autoprefixer": "^10.4.19",
36-
"eslint": "^9.13.0",
37-
"eslint-config-prettier": "^9.1.0",
38-
"eslint-plugin-prettier": "^5.2.1",
39-
"eslint-plugin-svelte": "^2.45.1",
40-
"globals": "^15.11.0",
41-
"husky": "^9.0.11",
42-
"postcss": "^8.4.38",
43-
"prettier": "^3.3.2",
44-
"prettier-plugin-svelte": "^3.2.5",
45-
"svelte": "^4.2.18",
46-
"svelte-check": "^3.8.1",
47-
"tailwindcss": "^3.4.4",
48-
"ts-json-schema-generator": "^1.5.0",
49-
"tslib": "^2.6.3",
50-
"typescript": "^5.5.2",
51-
"typescript-eslint": "^8.10.0",
52-
"vite": "^5.3.1",
53-
"vitest": "^1.6.0"
54-
},
55-
"type": "module",
56-
"dependencies": {
57-
"@types/d3": "^7.4.3",
58-
"d3": "^7.9.0",
59-
"d3-force": "^3.0.0",
60-
"markdown-it": "^14.1.0"
61-
}
2+
"name": "uwdata.github.io",
3+
"description": "Interactive Data Lab Website",
4+
"homepage": "http://idl.uw.edu/",
5+
"version": "2.0.0",
6+
"private": true,
7+
"license": "UNLICENSED",
8+
"scripts": {
9+
"dev": "vite dev",
10+
"build": "npm run integrity-enforcement && vite build && cp 404.html build/404.html",
11+
"preview": "vite preview",
12+
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
13+
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
14+
"lint": "prettier --check . && eslint .",
15+
"format": "prettier --write .",
16+
"prepare": "husky",
17+
"test": "npm run check && npm run integrity-enforcement && vitest run",
18+
"test:watch": "vitest",
19+
"integrity-enforcement": "vite-node scripts/integrity-enforcement.ts "
20+
},
21+
"devDependencies": {
22+
"@eslint/js": "^9.13.0",
23+
"@sveltejs/adapter-auto": "^3.2.2",
24+
"@sveltejs/adapter-static": "^3.0.2",
25+
"@sveltejs/kit": "^2.5.17",
26+
"@sveltejs/vite-plugin-svelte": "^3.1.1",
27+
"@types/d3-force": "^3.0.10",
28+
"@types/eslint": "^8.56.10",
29+
"@types/markdown-it": "^14.1.1",
30+
"@types/node": "^20.14.7",
31+
"@typescript-eslint/eslint-plugin": "^7.13.1",
32+
"@typescript-eslint/parser": "^7.13.1",
33+
"@vitest/ui": "^1.6.0",
34+
"ajv": "^8.16.0",
35+
"autoprefixer": "^10.4.19",
36+
"eslint": "^9.13.0",
37+
"eslint-config-prettier": "^9.1.0",
38+
"eslint-plugin-prettier": "^5.2.1",
39+
"eslint-plugin-svelte": "^2.45.1",
40+
"globals": "^15.11.0",
41+
"husky": "^9.0.11",
42+
"postcss": "^8.4.38",
43+
"prettier": "^3.3.2",
44+
"prettier-plugin-svelte": "^3.2.5",
45+
"svelte": "^4.2.18",
46+
"svelte-check": "^3.8.1",
47+
"tailwindcss": "^3.4.4",
48+
"ts-json-schema-generator": "^1.5.0",
49+
"tslib": "^2.6.3",
50+
"typescript": "^5.5.2",
51+
"typescript-eslint": "^8.10.0",
52+
"vite": "^5.3.1",
53+
"vitest": "^1.6.0"
54+
},
55+
"type": "module",
56+
"dependencies": {
57+
"@types/d3": "^7.4.3",
58+
"d3": "^7.9.0",
59+
"d3-force": "^3.0.0",
60+
"markdown-it": "^14.1.0"
61+
}
6262
}

‎src/app.css‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,76 +3,77 @@
33
@tailwind utilities;
44

55
a:hover {
6-
color: #8a5ed3;
6+
color: #8a5ed3;
77
}
88

99
.social:hover path {
10-
fill: #8a5ed3;
10+
fill: #8a5ed3;
1111
}
1212

1313
.halo:hover {
14-
box-shadow: 2px 2px 18px #8a5ed3;
14+
box-shadow: 2px 2px 18px #8a5ed3;
1515
}
1616

17-
strong, b {
18-
font-weight: 600;
17+
strong,
18+
b {
19+
font-weight: 600;
1920
}
2021

2122
.right {
22-
margin-top: 0.4em;
23-
margin-left: 1em;
24-
float: right;
23+
margin-top: 0.4em;
24+
margin-left: 1em;
25+
float: right;
2526
}
2627

2728
.text-2xs {
28-
font-size: 0.65rem;
29+
font-size: 0.65rem;
2930
}
3031

3132
.tracking-extra {
32-
letter-spacing: 0.15em;
33+
letter-spacing: 0.15em;
3334
}
3435

3536
.text-uw {
36-
color: #652c90;
37+
color: #652c90;
3738
}
3839

3940
p {
40-
margin-bottom: 0.5em;
41+
margin-bottom: 0.5em;
4142
}
4243

4344
.quote {
44-
padding-right: 5px;
45-
margin-bottom: 1em;
46-
font-style: italic;
45+
padding-right: 5px;
46+
margin-bottom: 1em;
47+
font-style: italic;
4748
}
4849

4950
.heading {
50-
margin-bottom: 5px;
51-
font-weight: 600;
52-
text-transform: uppercase;
53-
letter-spacing: 1px;
51+
margin-bottom: 5px;
52+
font-weight: 600;
53+
text-transform: uppercase;
54+
letter-spacing: 1px;
5455
}
5556

5657
.lead {
57-
font-size: 15px;
58-
font-weight: 600;
59-
text-transform: uppercase;
60-
letter-spacing: 2px;
58+
font-size: 15px;
59+
font-weight: 600;
60+
text-transform: uppercase;
61+
letter-spacing: 2px;
6162
}
6263

6364
div.lead {
64-
margin-bottom: 0.5em;
65+
margin-bottom: 0.5em;
6566
}
6667

6768
.update a {
68-
font-weight: 500;
69+
font-weight: 500;
6970
}
7071

7172
.markdown h2 {
72-
font-size: 15px;
73-
font-weight: 600;
74-
text-transform: uppercase;
75-
letter-spacing: 2px;
76-
margin-bottom: 0.5em;
77-
margin-top: 1em;
73+
font-size: 15px;
74+
font-weight: 600;
75+
text-transform: uppercase;
76+
letter-spacing: 2px;
77+
margin-bottom: 0.5em;
78+
margin-top: 1em;
7879
}

‎src/app.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!doctype html>
22
<html lang="en">
3-
<head>
4-
<title>UW Interactive Data Lab</title>
5-
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
6-
<meta charset="utf-8" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1" />
8-
<meta property="og:locale" content="en_US" />
9-
<meta property="og:site_name" content="UW Interactive Data Lab" />
10-
%sveltekit.head%
11-
</head>
12-
<body data-sveltekit-preload-data="hover">
13-
<div style="display: contents">%sveltekit.body%</div>
14-
</body>
3+
<head>
4+
<title>UW Interactive Data Lab</title>
5+
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
6+
<meta charset="utf-8" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1" />
8+
<meta property="og:locale" content="en_US" />
9+
<meta property="og:site_name" content="UW Interactive Data Lab" />
10+
%sveltekit.head%
11+
</head>
12+
<body data-sveltekit-preload-data="hover">
13+
<div style="display: contents">%sveltekit.body%</div>
14+
</body>
1515
</html>

‎src/fonts.css‎

Lines changed: 50 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,66 @@
11
@font-face {
2-
font-family: "Avenir";
3-
src: url('/fonts/AvenirNext/Regular/avenirnextregular.eot');
4-
src: url('/fonts/AvenirNext/Regular/avenirnextregular.eot?#iefix') format('embedded-opentype'), url('/fonts/AvenirNext/Regular/avenirnextregular.woff') format('woff'), url('/fonts/AvenirNext/Regular/avenirnextregular.ttf') format('truetype');
5-
font-weight: normal;
6-
font-style: normal;
2+
font-family: 'Avenir';
3+
src: url('/fonts/AvenirNext/Regular/avenirnextregular.eot');
4+
src:
5+
url('/fonts/AvenirNext/Regular/avenirnextregular.eot?#iefix') format('embedded-opentype'),
6+
url('/fonts/AvenirNext/Regular/avenirnextregular.woff') format('woff'),
7+
url('/fonts/AvenirNext/Regular/avenirnextregular.ttf') format('truetype');
8+
font-weight: normal;
9+
font-style: normal;
710
}
811

912
@font-face {
10-
font-family: "Avenir";
11-
src: url('/fonts/AvenirNext/Italic/avenirnextregularitalic.eot');
12-
src: url('/fonts/AvenirNext/Italic/avenirnextregularitalic.eot?#iefix') format('embedded-opentype'), url('/fonts/AvenirNext/Italic/avenirnextregularitalic.woff') format('woff'), url('/fonts/AvenirNext/Italic/avenirnextregularitalic.ttf') format('truetype');
13-
font-weight: normal;
14-
font-style: italic
13+
font-family: 'Avenir';
14+
src: url('/fonts/AvenirNext/Italic/avenirnextregularitalic.eot');
15+
src:
16+
url('/fonts/AvenirNext/Italic/avenirnextregularitalic.eot?#iefix') format('embedded-opentype'),
17+
url('/fonts/AvenirNext/Italic/avenirnextregularitalic.woff') format('woff'),
18+
url('/fonts/AvenirNext/Italic/avenirnextregularitalic.ttf') format('truetype');
19+
font-weight: normal;
20+
font-style: italic;
1521
}
1622

1723
@font-face {
18-
font-family: "Avenir";
19-
src: url('/fonts/AvenirNext/Medium/avenirnextmedium.eot');
20-
src: url('/fonts/AvenirNext/Medium/avenirnextmedium.eot?#iefix') format('embedded-opentype'), url('/fonts/AvenirNext/Medium/avenirnextmedium.woff') format('woff'), url('/fonts/AvenirNext/Medium/avenirnextmedium.ttf') format('truetype');
21-
font-weight: 500;
22-
font-style: normal;
24+
font-family: 'Avenir';
25+
src: url('/fonts/AvenirNext/Medium/avenirnextmedium.eot');
26+
src:
27+
url('/fonts/AvenirNext/Medium/avenirnextmedium.eot?#iefix') format('embedded-opentype'),
28+
url('/fonts/AvenirNext/Medium/avenirnextmedium.woff') format('woff'),
29+
url('/fonts/AvenirNext/Medium/avenirnextmedium.ttf') format('truetype');
30+
font-weight: 500;
31+
font-style: normal;
2332
}
2433

2534
@font-face {
26-
font-family: "Avenir";
27-
src: url('/fonts/AvenirNext/DemiBold/avenirnextdemibold.eot');
28-
src: url('/fonts/AvenirNext/DemiBold/avenirnextdemibold.eot?#iefix') format('embedded-opentype'), url('/fonts/AvenirNext/DemiBold/avenirnextdemibold.woff') format('woff'), url('/fonts/AvenirNext/DemiBold/avenirnextdemibold.ttf') format('truetype');
29-
font-weight: 600;
30-
font-style: normal;
35+
font-family: 'Avenir';
36+
src: url('/fonts/AvenirNext/DemiBold/avenirnextdemibold.eot');
37+
src:
38+
url('/fonts/AvenirNext/DemiBold/avenirnextdemibold.eot?#iefix') format('embedded-opentype'),
39+
url('/fonts/AvenirNext/DemiBold/avenirnextdemibold.woff') format('woff'),
40+
url('/fonts/AvenirNext/DemiBold/avenirnextdemibold.ttf') format('truetype');
41+
font-weight: 600;
42+
font-style: normal;
3143
}
3244

3345
@font-face {
34-
font-family: "Avenir";
35-
src: url('/fonts/AvenirNext/DemiBoldItalic/avenirnextdemibolditalic.eot');
36-
src: url('/fonts/AvenirNext/DemiBoldItalic/avenirnextdemibolditalic.eot?#iefix') format('embedded-opentype'), url('/fonts/AvenirNext/DemiBoldItalic/avenirnextdemibolditalic.woff') format('woff'), url('/fonts/AvenirNext/DemiBoldItalic/avenirnextdemibolditalic.ttf') format('truetype');
37-
font-weight: 600;
38-
font-style: italic;
46+
font-family: 'Avenir';
47+
src: url('/fonts/AvenirNext/DemiBoldItalic/avenirnextdemibolditalic.eot');
48+
src:
49+
url('/fonts/AvenirNext/DemiBoldItalic/avenirnextdemibolditalic.eot?#iefix')
50+
format('embedded-opentype'),
51+
url('/fonts/AvenirNext/DemiBoldItalic/avenirnextdemibolditalic.woff') format('woff'),
52+
url('/fonts/AvenirNext/DemiBoldItalic/avenirnextdemibolditalic.ttf') format('truetype');
53+
font-weight: 600;
54+
font-style: italic;
3955
}
4056

4157
@font-face {
42-
font-family: "Avenir";
43-
src: url('/fonts/AvenirNext/Bold/avenirnextbold.eot');
44-
src: url('/fonts/AvenirNext/Bold/avenirnextbold.eot?#iefix') format('embedded-opentype'), url('/fonts/AvenirNext/Bold/avenirnextbold.woff') format('woff'), url('/fonts/AvenirNext/Bold/avenirnextbold.ttf') format('truetype');
45-
font-weight: bold;
46-
font-style: normal;
47-
}
58+
font-family: 'Avenir';
59+
src: url('/fonts/AvenirNext/Bold/avenirnextbold.eot');
60+
src:
61+
url('/fonts/AvenirNext/Bold/avenirnextbold.eot?#iefix') format('embedded-opentype'),
62+
url('/fonts/AvenirNext/Bold/avenirnextbold.woff') format('woff'),
63+
url('/fonts/AvenirNext/Bold/avenirnextbold.ttf') format('truetype');
64+
font-weight: bold;
65+
font-style: normal;
66+
}

0 commit comments

Comments
 (0)