Skip to content

Commit 05ffb72

Browse files
committed
Merge branch 'how-to-label-your-p5-canvas-tutorial' of https://github.com/katlich112358/p5.js-website-gsoc-2023-v2 into how-to-label-your-p5-canvas-tutorial
2 parents d8fda3d + ae60322 commit 05ffb72

Some content is hidden

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

48 files changed

+9163
-7782
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ src/offline-reference
3030
!src/templates/pages/examples/.gitkeep
3131
dist/*
3232
!dist/git-pull.php
33-
!dist/download/release.php
33+
!dist/download/version.json
3434
!dist/books/media.zip
3535
!dist/learn/books/media.zip
36+

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ module.exports = function(grunt) {
310310
clean: {
311311
assets: [
312312
'<%= config.dist %>/**/*.*',
313-
'!<%= config.dist %>/download/release.php',
313+
'!<%= config.dist %>/download/version.json',
314314
'!<%= config.dist %>/git-pull.php',
315315
'!<%= config.dist %>/books/media.zip',
316316
'!<%= config.dist %>/learn/books/media.zip',

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Once you've setup the site, type `npm run watch` to run the website. This should
6262

6363
## File structure
6464

65-
* __See note about what to include in pull requests [here](https://github.com/processing/p5.js/blob/main/contributor_docs/preparing_a_pull_request.md).__
65+
* __See note about what to include in pull requests [here](https://github.com/processing/p5.js/blob/main/contributor_docs/contributor_guidelines.md#pull-requests).__
6666
* `src/` – All the pieces for generating the built site. __Edits should be made here.__
6767
* `assets/` – All static files (imgs, css, fonts, js, p5_featured homepage sketches)
6868
* Note: if you make edits here you must restart the server to see your changes. To see changes immediately, you can edit the assets files in the dist directory, but need to copy and paste your updated work here for it to be saved.

dist/download/release.php

Lines changed: 0 additions & 63 deletions
This file was deleted.

dist/download/version.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"version": "1.8.0",
3+
"date": "October 25, 2023"
4+
}

0 commit comments

Comments
 (0)