resolve merge conflicts

1 files changed, 37 insertions, 0 deletions

diff --git a/content/overview-embed-vimeo.md b/content/overview-embed-vimeo.md
new file mode 100644
index 0000000..bc8cd93
--- /dev/null
+++ b/content/overview-embed-vimeo.md
@@ -0,0 +1,37 @@
++++
+title = "Embed Vimeo Video"
+description = "Sample article showcasing a custom Zola shortcode for embedding Vimeo Videos into your pages."
+date = 2021-05-07
+draft = false
+
+[taxonomies]
+categories = ["Features"]
+tags = ["shortcodes","video"]
+[extra]
+keywords = "Video, Shortcodes, Embed, Embedded, Vimeo"
++++
+
+Zola has many shortcodes, and new are easily added, this example shows vimeo.
+<!-- more -->
+
+## Vimeo
+
+### Usage
+
+```rs
+{{/* vimeo(id="514402648") */}}
+```
+
+- `id`: the video id (mandatory)
+- `class`: a class to add to the &lt;div&gt; surrounding the iframe (optional)
+- `autoplay`: when set to "true", the video autoplays on load (optional)
+- `loop`: when set to "true", the video plays on a loop (optional)
+- `noautopause`: when set to "true", the video will not autopause (optional)
+- `title` - set alt title for the iframe (optional, defaults to "Vimeo")
+- `cookie` - set to "true" if you want tracking cookies, otherwise it defaults to false.
+
+### Output
+```html
+{{ vimeo(id="514402648") }}
+```
+{{ vimeo(id="514402648") }}