Merge branch 'master' into es6-integration

5 files changed, 9 insertions, 0 deletions

diff --git a/public/css/cover.css b/public/css/cover.css
index a1527bfa..6e191d2b 100644
--- a/public/css/cover.css
+++ b/public/css/cover.css
@@ -354,6 +354,12 @@ input {
     color: white;
 }
 
+.screenshot {
+    margin: 30px auto;
+    width: 100%;
+    border-radius: 3px;
+}
+
 select {
     color: black;
 }
diff --git a/public/js/index.js b/public/js/index.js
index 8e3bc561..39f28fbd 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -3452,6 +3452,7 @@ function updateViewInner() {
     var value = editor.getValue();
     var lastMeta = md.meta;
     md.meta = {};
+    delete md.metaError;
     var rendered = md.render(value);
     if (md.meta.type && md.meta.type === 'slide') {
         var slideOptions = {
diff --git a/public/js/pretty.js b/public/js/pretty.js
index 64d41c43..18d0dc0d 100644
--- a/public/js/pretty.js
+++ b/public/js/pretty.js
@@ -24,6 +24,7 @@ const markdown = $("#doc.markdown-body");
 const text = markdown.text();
 const lastMeta = md.meta;
 md.meta = {};
+delete md.metaError;
 let rendered = md.render(text);
 if (md.meta.type && md.meta.type === 'slide') {
     const slideOptions = {
diff --git a/public/screenshot.png b/public/screenshot.png
new file mode 100644
index 00000000..e1e77431
--- /dev/null
+++ b/public/screenshot.png
diff --git a/public/views/index.ejs b/public/views/index.ejs
index 25139907..4bcea0eb 100644
--- a/public/views/index.ejs
+++ b/public/views/index.ejs
@@ -87,6 +87,7 @@
                             <a type="button" href="<%- url %>/features" class="btn btn-lg btn-primary" style="min-width: 200px;"><%= __('Explore all features') %></a>
                             <br>
                             <br>
+                            <img src="<%- url %>/screenshot.png" class="screenshot ui-signin">
                         </span>
                         <div class="lead row" style="width: 90%; margin: 0 auto;">
                             <div class="col-md-4 inner">