From b5be719581b054ec7f080b45be7d438b2b576490 Mon Sep 17 00:00:00 2001 From: Caleb Sacks <16855387+clabe45@users.noreply.github.com> Date: Thu, 8 Sep 2022 19:34:27 -0400 Subject: [PATCH 01/17] Fix rm in build script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c59b1e5..cec77a6 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "start": "zola serve", "test": "echo \"Error: no test specified\" && exit 1", - "build": "rm -r public; zola build && cp CNAME public && cd etro && npm i && npm run doc && mv docs ../public/docs/api && git restore package-lock.json", + "build": "rm -rf public; zola build && cp CNAME public && cd etro && npm i && npm run doc && mv docs ../public/docs/api && git restore package-lock.json", "prepublish": "npm run build", "publish": "gh-pages -d public" }, From 8395f2a93e21a86d4822032391ab5ec0e8a61902 Mon Sep 17 00:00:00 2001 From: Caleb Sacks <16855387+clabe45@users.noreply.github.com> Date: Fri, 9 Sep 2022 20:42:17 -0400 Subject: [PATCH 02/17] Switch etro submodule to https --- .gitmodules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmodules b/.gitmodules index 256a87b..a47d3d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,5 @@ [submodule "etro"] path = etro url = https://github.com/etro-js/etro.git +[submodule "etro/"] + url = https://github.com/etro-js/etro.git From 8644425972d7a30cb0f9d7cf9d87a375d738c196 Mon Sep 17 00:00:00 2001 From: Caleb Sacks <16855387+clabe45@users.noreply.github.com> Date: Fri, 9 Sep 2022 21:10:35 -0400 Subject: [PATCH 03/17] Update etro to v0.8.5 --- etro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etro b/etro index 2a0b559..a53a306 160000 --- a/etro +++ b/etro @@ -1 +1 @@ -Subproject commit 2a0b559d896cdc7fa5beb391a1239abc65a2f268 +Subproject commit a53a306c810db506721be0e6c40759df8486cbe9 From 1b4810c6562b81d0196e94285450cc42e77d432c Mon Sep 17 00:00:00 2001 From: Caleb Sacks <16855387+clabe45@users.noreply.github.com> Date: Sun, 18 Sep 2022 15:13:26 -0400 Subject: [PATCH 04/17] Update etro to v0.9.1 --- etro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etro b/etro index a53a306..487f206 160000 --- a/etro +++ b/etro @@ -1 +1 @@ -Subproject commit a53a306c810db506721be0e6c40759df8486cbe9 +Subproject commit 487f206ff139a2ae462b01d10c0077980d00795d From ba5e33f67a3f6fc4503c2f3b51f231a1fbb8e081 Mon Sep 17 00:00:00 2001 From: Caleb Sacks <16855387+clabe45@users.noreply.github.com> Date: Sun, 18 Sep 2022 15:19:26 -0400 Subject: [PATCH 05/17] Reset submodules before building --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index cec77a6..d191701 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,10 @@ "description": "", "main": "index.js", "scripts": { + "reset": "git submodule deinit -f --all && git submodule update --init --recursive", "start": "zola serve", "test": "echo \"Error: no test specified\" && exit 1", - "build": "rm -rf public; zola build && cp CNAME public && cd etro && npm i && npm run doc && mv docs ../public/docs/api && git restore package-lock.json", + "build": "npm run reset && rm -rf public; zola build && cp CNAME public && cd etro && npm i && npm run doc && mv docs ../public/docs/api && git restore package-lock.json", "prepublish": "npm run build", "publish": "gh-pages -d public" }, From 946125038f33fa6afde5a310689b9157a9ae3c51 Mon Sep 17 00:00:00 2001 From: Caleb Sacks <16855387+clabe45@users.noreply.github.com> Date: Sun, 18 Sep 2022 15:38:35 -0400 Subject: [PATCH 06/17] Fix tutorial links --- content/docs/tutorial/movies.md | 3 ++- content/docs/tutorial/overview.md | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/content/docs/tutorial/movies.md b/content/docs/tutorial/movies.md index 1a22ffd..7a1b913 100644 --- a/content/docs/tutorial/movies.md +++ b/content/docs/tutorial/movies.md @@ -23,4 +23,5 @@ movie.height = 200 // also sets the canvas's height to 200 ``` Now we have a 200x200 movie, but there are no layers so nothing will be -rendered. In the [next section](layers), we'll add a video clip to the movie. +rendered. In the [next section](../layers), we'll add a video clip to the +movie. diff --git a/content/docs/tutorial/overview.md b/content/docs/tutorial/overview.md index ee9f625..012a229 100644 --- a/content/docs/tutorial/overview.md +++ b/content/docs/tutorial/overview.md @@ -25,7 +25,7 @@ movie.play() movie.record({ frameRate: 30 }).then(blob => /*do something with `blob`*/) ``` -See the [`Movie` documentation](./movies.md). +See the [`Movie` documentation](../movies.md). # Layers @@ -39,15 +39,15 @@ var layer2 = new etro.layer.Video({ startTime: 3, source: htmlVideoEl }) movie.layers.push(layer1, layer2) // the same as calling movie.addLayer ``` -There are a number of [built-in layers](../api/modules/layer.html), but you can -also subclass any of them and create your own. +There are a number of [built-in layers](/docs/api/modules/layer.html), but you +can also subclass any of them and create your own. # Effects Effects alter a layer or movie's output. Currently, only visual effects are supported. Audio can be manipulated using the [web audio API] (see -[`Audio`](../api/classes/layer.audio.html)). Etro offers a set of [built-in -effects](../api/modules/effect.html) that can be used like this: +[`Audio`](/docs/api/classes/layer.audio.html)). Etro offers a set of [built-in +effects](/docs/api/modules/effect.html) that can be used like this: ```js var effect = new etro.effect.Contrast(2.0) layer.addEffect(effect) From c9675548d407c945106d2eba64f9394c01d993ed Mon Sep 17 00:00:00 2001 From: Caleb Sacks <16855387+clabe45@users.noreply.github.com> Date: Sat, 10 Dec 2022 22:21:48 -0500 Subject: [PATCH 07/17] Revert "Add footer with notice for project rename" Enough time has passed, no need to keep this This reverts commit 55266eafd06234d8d0c9972da8b05b990d5c280f. --- sass/style.sass | 9 --------- templates/index.html | 9 +++------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/sass/style.sass b/sass/style.sass index bca3462..8d4efa1 100644 --- a/sass/style.sass +++ b/sass/style.sass @@ -13,12 +13,3 @@ pre code font-weight: bold font-family: "Fira Sans", sans-serif !important -body - min-height: 100vh - -main - min-height: 66vh - padding-top: -50em - -.content - justify-content: normal diff --git a/templates/index.html b/templates/index.html index 3c3d1c4..ca46f90 100644 --- a/templates/index.html +++ b/templates/index.html @@ -69,12 +69,9 @@

{% endif %} {% endblock toc %} {% block footer %} -