Merge branch 'master' of https://github.com/transloadit/uppy

bin/to-gif.sh

@@ -12,18 +12,21 @@ __root="$(cd "$(dirname "${__dir}")" && pwd)"
 
 width=600
 speed=0.7
+input="${__root}/assets/uppy-demo2.mov"
+base="$(basename "${input}")"
+output="${__root}/assets/${base}.gif"
 
 ffmpeg \
   -y \
-  -i "${__root}/assets/uppy-demo.mp4" \
-  -vf fps=10,scale=${width}:-1:flags=lanczos,palettegen "${__root}/assets/palette.png"
+  -i "${input}" \
+  -vf fps=10,scale=${width}:-1:flags=lanczos,palettegen "${__root}/assets/${base}-palette.png"
 
 ffmpeg \
   -y \
-  -i "${__root}/assets/uppy-demo.mp4" \
-  -i "${__root}/assets/palette.png" \
+  -i "${input}" \
+  -i "${__root}/assets/${base}-palette.png" \
   -filter_complex "setpts=${speed}*PTS,fps=10,scale=${width}:-1:flags=lanczos[x];[x][1:v]paletteuse" \
-  "${__root}/assets/uppy-demo.gif"
+  "${output}"
 
-du -hs "${__root}/assets/uppy-demo.gif"
-open -a 'Google Chrome' "${__root}/assets/uppy-demo.gif"
+du -hs "${output}"
+open -a 'Google Chrome' "${output}"

website/themes/uppy/layout/example.ejs

@@ -9,14 +9,14 @@
   <hr>
 
   <p>Hey there stranger! Uppy <img src="/images/emojis/dog.png" width="14" align="absmiddle">
-    is in the early stages of development and the example section
-    is our playground. Things might not yet work, but we're working hard to improve this.</p>
+    is actively developed and the example section
+    is our playground. Things might not work, but we're working hard to improve.</p>
   <p>We're on a monthly release cycle and our latest version is
     <a href="https://github.com/transloadit/uppy/blob/master/CHANGELOG.md#<%- theme.uppy_version_anchor %>">v<%- theme.uppy_version %></a>,
     but the example pages reflect the latest work in our master branch. Here's
     <a href="https://github.com/transloadit/uppy/compare/v<%- theme.uppy_version %>...master">what changed in master since v<%- theme.uppy_version %></a>
     in terms of commits, while the CHANGELOG
-    provides a higher level view of this things planned for our
+    provides a higher level view of the things planned for our
     <a href="https://github.com/transloadit/uppy/blob/master/CHANGELOG.md#next">next release</a>.</p>
 
   <!-- Add textarea already so it's available immediately for logging.