Merge branch 'master' of github.com:btd/stackedit into btd-dev

Dockerfile

@@ -0,0 +1,15 @@
+# Dockerfile for StackEdit
+
+FROM shykes/nodejs
+
+RUN apt-get update
+RUN apt-get upgrade
+
+RUN apt-get install -y git-core
+
+RUN git clone https://github.com/benweet/stackedit.git
+
+RUN (cd /stackedit/ && npm install)
+EXPOSE 3000
+
+CMD (cd /stackedit/ && node server.js)

README.md

@@ -40,13 +40,16 @@ StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown
  - [Theming guide][4]
 
 ### Support StackEdit:
+
+<a href="https://flattr.com/submit/auto?user_id=benweet&url=https%3A%2F%2Fgithub.com%2Fbenweet%2Fstackedit" target="_blank"><img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0"></a>
+
 [![Fund me on Gittip](https://www.gittip.com/assets/gittip.png)](https://www.gittip.com/stackedit/ "Fund me on Gittip")
 
 > **NOTE:** This page has been written and published with [StackEdit][5].
 
 
   [1]: https://developer.mozilla.org/en-US/docs/Web/Guide/DOM/Storage#localStorage
-  [2]: https://github.com/benweet/stackedit/blob/master/WELCOME.md#welcome-to-stackedit---welcome "Welcome document"
+  [2]: https://github.com/benweet/stackedit/blob/master/public/res/WELCOME.md#welcome-to-stackedit---welcome "Welcome document"
   [3]: https://github.com/benweet/stackedit/blob/master/doc/developer-guide.md#developer-guide "Developer guide"
   [4]: https://github.com/benweet/stackedit/blob/master/doc/theming.md#stackedit-theming-guide "Theming guide"
   [5]: https://stackedit.io/ "StackEdit"

public/res/extensions/markdownExtra.js

@@ -64,7 +64,7 @@ define([
             options.highlighter = "prettify";
             var previewContentsElt = document.getElementById('preview-contents');
             editor.hooks.chain("onPreviewRefresh", function() {
-                _.each(previewContentsElt.querySelectorAll('.prettyprint'), function(elt) {
+                _.each(previewContentsElt.querySelectorAll('.prettyprint > code'), function(elt) {
                     hljs.highlightBlock(elt);
                 });
             });