Skip to content

Commit 5146999

Browse files
authored
Merge branch 'develop' into version-switcher
2 parents 312db23 + 5b7b8d8 commit 5146999

File tree

5 files changed

+16
-21
lines changed

5 files changed

+16
-21
lines changed

README.md

+6-12
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ Learn more about [our community](https://p5js.org/community/) and read our commu
1616

1717
Make your first sketch in the [p5.js Editor](https://editor.p5js.org/)! Learn more about sketching with p5.js on the [Get Started](https://p5js.org/tutorials/get-started/) and find everything you can do in the [Reference](https://p5js.org/reference/). You can also look at [examples](https://editor.p5js.org/p5/sketches) and remix them in the p5.js Editor.
1818

19+
## Contributing
20+
21+
[Contributing to the p5.js Web Editor](https://github.com/processing/p5.js-web-editor/blob/develop/contributor_docs/README.md)
22+
23+
[p5.js Community Statement](https://editor.p5js.org/code-of-conduct)
24+
1925

2026
## Issues
2127

@@ -24,18 +30,6 @@ If you have found a bug in the p5.js Web Editor, you can file it under the ["iss
2430
* p5.js library: [https://github.com/processing/p5.js/issues](https://github.com/processing/p5.js/issues)
2531
* p5.js website: [https://github.com/processing/p5.js-website/issues](https://github.com/processing/p5.js-website/issues)
2632

27-
28-
## References for Contributing to the p5.js Web Editor
29-
30-
[Code of Conduct](https://editor.p5js.org/code-of-conduct)
31-
32-
[Contribution Guidelines for p5.js](https://p5js.org/contributor-docs/#/)
33-
34-
[Contribution Guidelines for the p5.js Web Editor](https://github.com/processing/p5.js-web-editor/tree/develop/contributor_docs)
35-
36-
[p5.js Community Statement](https://p5js.org/community/)
37-
38-
3933
## Acknowledgements
4034

4135
Support for this project has come from [Processing Foundation](https://processingfoundation.org/), [NYU ITP](https://tisch.nyu.edu/itp), [CS4All, NYC DOE](http://cs4all.nyc/), [COSA at DU](https://liberalarts.du.edu/emergent-digital-practices/open-source-arts), [STUDIO for Creative Inquiry](https://studioforcreativeinquiry.org/), [Grant for the Web](https://www.grantfortheweb.org/), [New Media Rights](https://www.newmediarights.org/), and many others.

client/styles/components/_overlay.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
.overlay__close-button {
6363
@include icon();
64-
padding: #{math.div(3, $base-font-size)}rem 0 #{math.div(3, $base-font-size)}rem #{math.div(10, $base-font-size)}rem;
64+
padding: #{math.div(3, $base-font-size)}rem 0 #{math.div(3, $base-font-size)}rem;
6565
}
6666

6767
/* Fixed height overlay */

client/styles/components/_sketch-list.scss

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
}
102102

103103
& svg {
104+
margin-left: #{math.div(5, $base-font-size)}rem;
104105
@include themify() {
105106
fill: getThemifyVariable("inactive-text-color");
106107
}

contributor_docs/installation.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Follow these instructions to set up your development environment, which you need
66

77
_Note_: The installation steps assume you are using a Unix-like shell. If you are using Windows, you will need to use `copy` instead of `cp`.
88

9-
1. Install Node.js. The recommended way is to Node through [nvm](https://github.com/nvm-sh/nvm). You can also install [node.js](https://nodejs.org/download/release/v16.14.2/) version 16.14.2 directly from the Node.js website.
9+
1. Install Node.js. The recommended way is to Node through [nvm](https://github.com/nvm-sh/nvm). You can also install [node.js](https://nodejs.org/download/release/v16.14.2/) version 16.14.2 directly from the Node.js website. To check if you already have Node installed on your computer, run `$ node -v`.
1010
2. [Fork](https://help.github.com/articles/fork-a-repo) the [p5.js Web Editor repository](https://github.com/processing/p5.js-web-editor) into your own GitHub account.
1111
3. [Clone](https://help.github.com/articles/cloning-a-repository/) your new fork of the repository from GitHub onto your local computer.
1212

@@ -29,12 +29,12 @@ _Note_: The installation steps assume you are using a Unix-like shell. If you ar
2929
9. (Optional) Update `.env` with necessary keys to enable certain app behaviors, i.e. add Github ID and Github Secret if you want to be able to log in with Github.
3030
* See the [GitHub API Configuration](#github-api-configuration) section for information on how to authenticate with Github.
3131
* See the [S3 Bucket Configuration](#s3-bucket-configuration) section for information on how to set up an S3 bucket
32-
11. Run `$ npm run fetch-examples` to download the example sketches into a user called 'p5'. Note that you need to configure your GitHub Credentials, which you can do by following the [Github API Configuration](#github-api-configuration) section.
33-
12. Enable Prettier in your text editor by following [this guide](https://prettier.io/docs/en/editors.html).
34-
13. `$ npm start`
35-
14. Navigate to [http://localhost:8000](http://localhost:8000) in your browser
36-
15. Install the [React Developer Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en)
37-
16. Open and close the Redux DevTools using `ctrl+h`, and move them with `ctrl+w`
32+
10. Run `$ npm run fetch-examples` to download the example sketches into a user called 'p5'. Note that you need to configure your GitHub Credentials, which you can do by following the [Github API Configuration](#github-api-configuration) section.
33+
11. Enable Prettier in your text editor by following [this guide](https://prettier.io/docs/en/editors.html).
34+
12. `$ npm start`
35+
13. Navigate to [http://localhost:8000](http://localhost:8000) in your browser
36+
14. Install the [React Developer Tools](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en)
37+
15. Open and close the Redux DevTools using `ctrl+h`, and move them with `ctrl+w`
3838

3939
## Docker Installation
4040

translations/locales/en-US/translations.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
},
173173
"Preferences": {
174174
"Settings": "Settings",
175-
"GeneralSettings": "General settings",
175+
"GeneralSettings": "General Settings",
176176
"Accessibility": "Accessibility",
177177
"LibraryManagement": "Library Management",
178178
"Theme": "Theme",

0 commit comments

Comments
 (0)