Fixed memory leaks

Gruntfile.js

@@ -3,6 +3,7 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-requirejs');
     grunt.loadNpmTasks('grunt-contrib-less');
+    grunt.loadNpmTasks('grunt-jsbeautifier');
     grunt.loadNpmTasks('grunt-string-replace');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-bower-requirejs');
@@ -35,14 +36,6 @@ module.exports = function(grunt) {
                     mainConfigFile: 'public/res/main.js',
                     optimize: "uglify2",
                     inlineText: true,
-                    /*
-                    uglify2: {
-                        output: {
-                            beautify: true,
-                            indent_level: 1,
-                        },
-                    },
-                    */
                     excludeShallow: [
                         'css/css-builder',
                         'less/lessc-server',
@@ -51,6 +44,16 @@ module.exports = function(grunt) {
                 }
             }
         },
+        jsbeautifier: {
+            files: ['public/res-min/main.js'],
+            options: {
+                js: {
+                    space_before_conditional: false,
+                    keep_array_indentation: true,
+                    indentWithTabs: true,
+                }
+            }
+        },
         less: {
             compile: {
                 options: {
@@ -182,6 +185,9 @@ module.exports = function(grunt) {
         // Run r.js optimization
         grunt.task.run('requirejs');
 
+        // Beautify uglified JS for site error analysis
+        grunt.task.run('jsbeautifier');
+
     });
 
     /***************************************************************************

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "stackedit",
-  "version": "3.99.1",
+  "version": "3.99.2",
   "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.",
   "dependencies": {
     "bootstrap": "3.0.3",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackedit",
-  "version": "3.99.1",
+  "version": "3.99.2",
   "private": true,
   "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.",
   "main": "res/main.js",
@@ -22,7 +22,8 @@
     "grunt-bower-requirejs": "~0.7.1",
     "grunt-bower-task": "~0.3.1",
     "grunt-bump": "0.0.11",
-    "grunt-contrib-jshint": "~0.7.1"
+    "grunt-contrib-jshint": "~0.7.1",
+    "grunt-jsbeautifier": "^0.2.7"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

public/cache.manifest

@@ -1,8 +1,7 @@
 CACHE MANIFEST
-#Date Tue Apr 22 2014 00:21:08
+#Date Thu Apr 24 2014 00:11:08
 
 CACHE:
-res/worker.js
 libs/MathJax/MathJax.js?config=TeX-AMS_HTML
 libs/MathJax/config/Safe.js
 libs/MathJax/config/TeX-AMS_HTML.js

public/res-min/themes/base.css

@@ -1213,11 +1213,7 @@ li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
 .icon-chat:before{content:'\e83e'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-up-circled:before{content:'\e893'}
-<<<<<<< HEAD
+@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-=======
-@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:400;src:local('Inconsolata'),url("../font/Inconsolata-Regular-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:700;src:local('Inconsolata Bold'),local('Inconsolata-Bold'),url("../font/Inconsolata-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:400;src:local('Anonymous Pro'),local('AnonymousPro'),url("../font/AnonymousPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:700;src:local('Anonymous Pro Bold'),local('AnonymousPro-Bold'),url("../font/AnonymousPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:400;src:local('Anonymous Pro Italic'),local('AnonymousPro-Italic'),url("../font/AnonymousPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:700;src:local('Anonymous Pro Bold Italic'),local('AnonymousPro-BoldItalic'),url("../font/AnonymousPro-BoldItalic-webfont.woff") format('woff')}.container{margin-bottom:180px}
->>>>>>> 754d9153095ec89be57ca8bd2144ddbac1b0eebb
 a code{color:inherit}
 h1{font-size:2.6em}
 h2{font-size:2.15em}
@@ -1230,6 +1226,7 @@ pre{word-break:break-word}
 p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em}
 hr{margin:2em 0}
 code,pre{font-family:"Source Code Pro",monospace;font-size:0.9em}
+code{white-space:normal}
 pre,pre.prettyprint{border:0 solid #eee;border-left:10px solid #eee;border-radius:0;border-top-right-radius:5px;border-bottom-right-radius:5px;padding:10px 15px}pre code,pre.prettyprint code{background-color:transparent !important}
 dt,dd{margin-top:5px;margin-bottom:5px}
 dd{margin-left:40px}

public/res-min/themes/default.css

@@ -1228,11 +1228,7 @@ li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
 .icon-chat:before{content:'\e83e'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-up-circled:before{content:'\e893'}
-<<<<<<< HEAD
+@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-=======
-@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:400;src:local('Inconsolata'),url("../font/Inconsolata-Regular-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:700;src:local('Inconsolata Bold'),local('Inconsolata-Bold'),url("../font/Inconsolata-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:400;src:local('Anonymous Pro'),local('AnonymousPro'),url("../font/AnonymousPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:700;src:local('Anonymous Pro Bold'),local('AnonymousPro-Bold'),url("../font/AnonymousPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:400;src:local('Anonymous Pro Italic'),local('AnonymousPro-Italic'),url("../font/AnonymousPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:700;src:local('Anonymous Pro Bold Italic'),local('AnonymousPro-BoldItalic'),url("../font/AnonymousPro-BoldItalic-webfont.woff") format('woff')}.container{margin-bottom:180px}
->>>>>>> 754d9153095ec89be57ca8bd2144ddbac1b0eebb
 a code{color:inherit}
 h1{font-size:2.6em}
 h2{font-size:2.15em}
@@ -1245,6 +1241,7 @@ pre{word-break:break-word}
 p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em}
 hr{margin:2em 0}
 code,pre{font-family:"Source Code Pro",monospace;font-size:0.9em}
+code{white-space:normal}
 pre,pre.prettyprint{border:0 solid rgba(102,128,153,0.075);border-left:10px solid rgba(102,128,153,0.075);border-radius:0;border-top-right-radius:5px;border-bottom-right-radius:5px;padding:10px 15px}pre code,pre.prettyprint code{background-color:transparent !important}
 dt,dd{margin-top:5px;margin-bottom:5px}
 dd{margin-left:40px}
@@ -1300,10 +1297,10 @@ div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px}
 div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em}
 div.jGrowl div.jGrowl-notification div.jGrowl-close{z-index:99;float:right;font-weight:bold;font-size:1em;cursor:pointer}
 div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:bold;text-align:center}
-@media print{div.jGrowl{display:none}}html,body{overflow:hidden}
+@media print{div.jGrowl{display:none}}body{tab-size:4}
-body{position:absolute;top:0;left:0;bottom:0;right:0;tab-size:4}
 *{outline:none !important}
 .working{cursor:progress}
+.dragging{cursor:move !important}
 .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}
 .dropdown-menu,.modal-content,.panel-content,.search-bar,.popover{-webkit-box-shadow:0 4px 16px rgba(0,0,0,0.225);box-shadow:0 4px 16px rgba(0,0,0,0.225)}
 .dropdown-menu>li>a{padding:5px 20px;border-top:1px solid transparent;border-bottom:1px solid transparent}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{border-color:rgba(0,128,255,0.1)}
@@ -1396,12 +1393,16 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba
 .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0}
 .extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}
 .extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}
-.extension-preview-buttons{position:absolute;z-index:10;right:45px;bottom:6px;background-color:#f0f2f5;border:1px solid rgba(0,128,255,0.08);border-radius:4px;-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons{position:absolute;right:0;bottom:0;z-index:40;background-color:#f0f2f5;border:1px solid rgba(0,128,255,0.08);border-radius:4px;cursor:move}.extension-preview-buttons.animate{-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}
-.extension-preview-buttons .dropdown-menu{margin-bottom:6px;padding-bottom:20px}
+.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons .dropdown-menu{margin-top:6px;margin-bottom:6px;padding-bottom:20px}
 .extension-preview-buttons hr{margin:0}
 .extension-preview-buttons .markdown-syntax,.extension-preview-buttons .table-of-contents{overflow-y:auto;overflow-x:hidden;padding-right:20px;margin-right:-20px;width:330px}
 .extension-preview-buttons .markdown-syntax{white-space:normal}
 .extension-preview-buttons .table-of-contents{padding:20px 0 15px;margin-left:-10px}.extension-preview-buttons .table-of-contents ul{margin-left:10px;padding-left:10px}
+.extension-preview-buttons .stat-button .value{vertical-align:text-top}
+.extension-preview-buttons .drag-me{color:rgba(102,128,153,0.35)}.extension-preview-buttons .drag-me.info-tooltip{color:#036}
+.extension-preview-buttons .drag-me i:before{width:5px}
 .modal-settings .modal-header{padding-bottom:0}
 .modal-settings textarea{max-width:100%;min-height:100px}
 .modal-settings .panel{border:0;border-radius:inherit;background:#fff;border-bottom:1px solid #f2f5f8;-webkit-box-shadow:none;box-shadow:none}

public/res-min/themes/gray.css

@@ -1228,11 +1228,7 @@ li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
 .icon-chat:before{content:'\e83e'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-up-circled:before{content:'\e893'}
-<<<<<<< HEAD
+@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-=======
-@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:400;src:local('Inconsolata'),url("../font/Inconsolata-Regular-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:700;src:local('Inconsolata Bold'),local('Inconsolata-Bold'),url("../font/Inconsolata-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:400;src:local('Anonymous Pro'),local('AnonymousPro'),url("../font/AnonymousPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:700;src:local('Anonymous Pro Bold'),local('AnonymousPro-Bold'),url("../font/AnonymousPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:400;src:local('Anonymous Pro Italic'),local('AnonymousPro-Italic'),url("../font/AnonymousPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:700;src:local('Anonymous Pro Bold Italic'),local('AnonymousPro-BoldItalic'),url("../font/AnonymousPro-BoldItalic-webfont.woff") format('woff')}.container{margin-bottom:180px}
->>>>>>> 754d9153095ec89be57ca8bd2144ddbac1b0eebb
 a code{color:inherit}
 h1{font-size:2.6em}
 h2{font-size:2.15em}
@@ -1245,6 +1241,7 @@ pre{word-break:break-word}
 p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em}
 hr{margin:2em 0}
 code,pre{font-family:"Source Code Pro",monospace;font-size:0.9em}
+code{white-space:normal}
 pre,pre.prettyprint{border:0 solid rgba(128,128,128,0.075);border-left:10px solid rgba(128,128,128,0.075);border-radius:0;border-top-right-radius:5px;border-bottom-right-radius:5px;padding:10px 15px}pre code,pre.prettyprint code{background-color:transparent !important}
 dt,dd{margin-top:5px;margin-bottom:5px}
 dd{margin-left:40px}
@@ -1300,10 +1297,10 @@ div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px}
 div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em}
 div.jGrowl div.jGrowl-notification div.jGrowl-close{z-index:99;float:right;font-weight:bold;font-size:1em;cursor:pointer}
 div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:bold;text-align:center}
-@media print{div.jGrowl{display:none}}html,body{overflow:hidden}
+@media print{div.jGrowl{display:none}}body{tab-size:4}
-body{position:absolute;top:0;left:0;bottom:0;right:0;tab-size:4}
 *{outline:none !important}
 .working{cursor:progress}
+.dragging{cursor:move !important}
 .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}
 .dropdown-menu,.modal-content,.panel-content,.search-bar,.popover{-webkit-box-shadow:0 4px 16px rgba(0,0,0,0.225);box-shadow:0 4px 16px rgba(0,0,0,0.225)}
 .dropdown-menu>li>a{padding:5px 20px;border-top:1px solid transparent;border-bottom:1px solid transparent}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{border-color:rgba(128,128,128,0.1)}
@@ -1396,12 +1393,16 @@ a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-top-color:r
 .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0}
 .extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}
 .extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}
-.extension-preview-buttons{position:absolute;z-index:10;right:45px;bottom:6px;background-color:#f3f3f3;border:1px solid rgba(128,128,128,0.08);border-radius:4px;-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons{position:absolute;right:0;bottom:0;z-index:40;background-color:#f3f3f3;border:1px solid rgba(128,128,128,0.08);border-radius:4px;cursor:move}.extension-preview-buttons.animate{-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}
-.extension-preview-buttons .dropdown-menu{margin-bottom:6px;padding-bottom:20px}
+.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons .dropdown-menu{margin-top:6px;margin-bottom:6px;padding-bottom:20px}
 .extension-preview-buttons hr{margin:0}
 .extension-preview-buttons .markdown-syntax,.extension-preview-buttons .table-of-contents{overflow-y:auto;overflow-x:hidden;padding-right:20px;margin-right:-20px;width:330px}
 .extension-preview-buttons .markdown-syntax{white-space:normal}
 .extension-preview-buttons .table-of-contents{padding:20px 0 15px;margin-left:-10px}.extension-preview-buttons .table-of-contents ul{margin-left:10px;padding-left:10px}
+.extension-preview-buttons .stat-button .value{vertical-align:text-top}
+.extension-preview-buttons .drag-me{color:rgba(128,128,128,0.35)}.extension-preview-buttons .drag-me.info-tooltip{color:#343434}
+.extension-preview-buttons .drag-me i:before{width:5px}
 .modal-settings .modal-header{padding-bottom:0}
 .modal-settings textarea{max-width:100%;min-height:100px}
 .modal-settings .panel{border:0;border-radius:inherit;background:#fff;border-bottom:1px solid #f5f5f5;-webkit-box-shadow:none;box-shadow:none}

public/res-min/themes/night.css

@@ -1228,11 +1228,7 @@ li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
 .icon-chat:before{content:'\e83e'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-up-circled:before{content:'\e893'}
-<<<<<<< HEAD
+@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-=======
-@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:400;src:local('Inconsolata'),url("../font/Inconsolata-Regular-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:700;src:local('Inconsolata Bold'),local('Inconsolata-Bold'),url("../font/Inconsolata-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:400;src:local('Anonymous Pro'),local('AnonymousPro'),url("../font/AnonymousPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:700;src:local('Anonymous Pro Bold'),local('AnonymousPro-Bold'),url("../font/AnonymousPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:400;src:local('Anonymous Pro Italic'),local('AnonymousPro-Italic'),url("../font/AnonymousPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:700;src:local('Anonymous Pro Bold Italic'),local('AnonymousPro-BoldItalic'),url("../font/AnonymousPro-BoldItalic-webfont.woff") format('woff')}.container{margin-bottom:180px}
->>>>>>> 754d9153095ec89be57ca8bd2144ddbac1b0eebb
 a code{color:inherit}
 h1{font-size:2.6em}
 h2{font-size:2.15em}
@@ -1245,6 +1241,7 @@ pre{word-break:break-word}
 p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em}
 hr{margin:2em 0}
 code,pre{font-family:"Source Code Pro",monospace;font-size:0.9em}
+code{white-space:normal}
 pre,pre.prettyprint{border:0 solid #6e6e6e;border-left:10px solid #6e6e6e;border-radius:0;border-top-right-radius:5px;border-bottom-right-radius:5px;padding:10px 15px}pre code,pre.prettyprint code{background-color:transparent !important}
 dt,dd{margin-top:5px;margin-bottom:5px}
 dd{margin-left:40px}
@@ -1300,10 +1297,10 @@ div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px}
 div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em}
 div.jGrowl div.jGrowl-notification div.jGrowl-close{z-index:99;float:right;font-weight:bold;font-size:1em;cursor:pointer}
 div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:bold;text-align:center}
-@media print{div.jGrowl{display:none}}html,body{overflow:hidden}
+@media print{div.jGrowl{display:none}}body{tab-size:4}
-body{position:absolute;top:0;left:0;bottom:0;right:0;tab-size:4}
 *{outline:none !important}
 .working{cursor:progress}
+.dragging{cursor:move !important}
 .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}
 .dropdown-menu,.modal-content,.panel-content,.search-bar,.popover{-webkit-box-shadow:0 4px 16px rgba(0,0,0,0.225);box-shadow:0 4px 16px rgba(0,0,0,0.225)}
 .dropdown-menu>li>a{padding:5px 20px;border-top:1px solid transparent;border-bottom:1px solid transparent}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{border-color:rgba(255,255,255,0.1)}
@@ -1396,12 +1393,16 @@ a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-top-color:r
 .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0}
 .extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}
 .extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}
-.extension-preview-buttons{position:absolute;z-index:10;right:45px;bottom:6px;background-color:#3a3a3a;border:1px solid rgba(255,255,255,0.08);border-radius:4px;-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons{position:absolute;right:0;bottom:0;z-index:40;background-color:#3a3a3a;border:1px solid rgba(255,255,255,0.08);border-radius:4px;cursor:move}.extension-preview-buttons.animate{-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}
-.extension-preview-buttons .dropdown-menu{margin-bottom:6px;padding-bottom:20px}
+.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons .dropdown-menu{margin-top:6px;margin-bottom:6px;padding-bottom:20px}
 .extension-preview-buttons hr{margin:0}
 .extension-preview-buttons .markdown-syntax,.extension-preview-buttons .table-of-contents{overflow-y:auto;overflow-x:hidden;padding-right:20px;margin-right:-20px;width:330px}
 .extension-preview-buttons .markdown-syntax{white-space:normal}
 .extension-preview-buttons .table-of-contents{padding:20px 0 15px;margin-left:-10px}.extension-preview-buttons .table-of-contents ul{margin-left:10px;padding-left:10px}
+.extension-preview-buttons .stat-button .value{vertical-align:text-top}
+.extension-preview-buttons .drag-me{color:rgba(255,255,255,0.35)}.extension-preview-buttons .drag-me.info-tooltip{color:#b3b3b3}
+.extension-preview-buttons .drag-me i:before{width:5px}
 .modal-settings .modal-header{padding-bottom:0}
 .modal-settings textarea{max-width:100%;min-height:100px}
 .modal-settings .panel{border:0;border-radius:inherit;background:#1e1e1e;border-bottom:1px solid #333;-webkit-box-shadow:none;box-shadow:none}

public/res-min/themes/original.css

@@ -909,7 +909,7 @@ li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
 .asciidoc .hljs-emphasis,.markdown .hljs-emphasis{font-style:italic}
 .nginx .hljs-built_in{font-weight:normal}
 .coffeescript .javascript,.javascript .xml,.lasso .markup,.tex .hljs-formula,.xml .javascript,.xml .vbscript,.xml .css,.xml .hljs-cdata{opacity:0.5}
-@font-face{font-family:'fontello';src:url('../font/fontello.eot');src:url('../font/fontello.eot#iefix') format('embedded-opentype'),url('../font/fontello.woff') format('woff'),url('../font/fontello.ttf') format('truetype'),url('../font/fontello.svg#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;}
+@font-face{font-family:'fontello';src:url('../font/fontello.eot?24620533');src:url('../font/fontello.eot?24620533#iefix') format('embedded-opentype'),url('../font/fontello.woff?24620533') format('woff'),url('../font/fontello.ttf?24620533') format('truetype'),url('../font/fontello.svg?24620533#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;}
 .icon-glass:before{content:'\e801'}
 .icon-archive:before{content:'\e859'}
 .icon-search:before{content:'\e803'}
@@ -1228,7 +1228,7 @@ li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
 .icon-chat:before{content:'\e83e'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-up-circled:before{content:'\e893'}
-@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
+@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
 a code{color:inherit}
 h1{font-size:2.6em}
 h2{font-size:2.15em}
@@ -1241,6 +1241,7 @@ pre{word-break:break-word}
 p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em}
 hr{margin:2em 0}
 code,pre{font-family:"Source Code Pro",monospace;font-size:0.9em}
+code{white-space:normal}
 pre,pre.prettyprint{border:0 solid rgba(154,154,154,0.075);border-left:10px solid rgba(154,154,154,0.075);border-radius:0;border-top-right-radius:5px;border-bottom-right-radius:5px;padding:10px 15px}pre code,pre.prettyprint code{background-color:transparent !important}
 dt,dd{margin-top:5px;margin-bottom:5px}
 dd{margin-left:40px}
@@ -1296,10 +1297,10 @@ div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px}
 div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em}
 div.jGrowl div.jGrowl-notification div.jGrowl-close{z-index:99;float:right;font-weight:bold;font-size:1em;cursor:pointer}
 div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:bold;text-align:center}
-@media print{div.jGrowl{display:none}}html,body{overflow:hidden}
+@media print{div.jGrowl{display:none}}body{tab-size:4}
-body{position:absolute;top:0;left:0;bottom:0;right:0;tab-size:4}
 *{outline:none !important}
 .working{cursor:progress}
+.dragging{cursor:move !important}
 .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}
 .dropdown-menu,.modal-content,.panel-content,.search-bar,.popover{-webkit-box-shadow:0 4px 16px rgba(0,0,0,0.225);box-shadow:0 4px 16px rgba(0,0,0,0.225)}
 .dropdown-menu>li>a{padding:5px 20px;border-top:1px solid transparent;border-bottom:1px solid transparent}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{border-color:rgba(154,154,154,0.1)}
@@ -1392,12 +1393,16 @@ a.list-group-item:hover,a.list-group-item:focus{color:#4e4e4e;border-top-color:r
 .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0}
 .extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}
 .extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}
-.extension-preview-buttons{position:absolute;z-index:10;right:45px;bottom:6px;background-color:#ededed;border:1px solid rgba(154,154,154,0.08);border-radius:4px;-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons{position:absolute;right:0;bottom:0;z-index:40;background-color:#ededed;border:1px solid rgba(154,154,154,0.08);border-radius:4px;cursor:move}.extension-preview-buttons.animate{-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}
-.extension-preview-buttons .dropdown-menu{margin-bottom:6px;padding-bottom:20px}
+.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons .dropdown-menu{margin-top:6px;margin-bottom:6px;padding-bottom:20px}
 .extension-preview-buttons hr{margin:0}
 .extension-preview-buttons .markdown-syntax,.extension-preview-buttons .table-of-contents{overflow-y:auto;overflow-x:hidden;padding-right:20px;margin-right:-20px;width:330px}
 .extension-preview-buttons .markdown-syntax{white-space:normal}
 .extension-preview-buttons .table-of-contents{padding:20px 0 15px;margin-left:-10px}.extension-preview-buttons .table-of-contents ul{margin-left:10px;padding-left:10px}
+.extension-preview-buttons .stat-button .value{vertical-align:text-top}
+.extension-preview-buttons .drag-me{color:rgba(154,154,154,0.35)}.extension-preview-buttons .drag-me.info-tooltip{color:#4e4e4e}
+.extension-preview-buttons .drag-me i:before{width:5px}
 .modal-settings .modal-header{padding-bottom:0}
 .modal-settings textarea{max-width:100%;min-height:100px}
 .modal-settings .panel{border:0;border-radius:inherit;background:#fcfcfc;border-bottom:1px solid #eee;-webkit-box-shadow:none;box-shadow:none}

public/res-min/themes/school.css

@@ -1228,11 +1228,7 @@ li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
 .icon-chat:before{content:'\e83e'}
 .icon-folder-open:before{content:'\e81e'}
 .icon-up-circled:before{content:'\e893'}
-<<<<<<< HEAD
+@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}.container{margin-bottom:180px}
-=======
-@font-face{font-family:'fontello';src:url('../font/fontello.svg#fontello') format('svg'),url('../font/fontello.woff') format('woff');font-weight:normal;font-style:normal}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:300;src:local('Source Sans Pro Light'),local('SourceSansPro-Light'),url("../font/SourceSansPro-Light-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:400;src:local('Source Sans Pro'),local('SourceSansPro'),url("../font/SourceSansPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:normal;font-weight:700;src:local('Source Sans Pro Bold'),local('SourceSansPro-Bold'),url("../font/SourceSansPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:300;src:local('Source Sans Pro Light Italic'),local('SourceSansProLight-Italic'),url("../font/SourceSansPro-LightItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:400;src:local('Source Sans Pro Italic'),local('SourceSansPro-Italic'),url("../font/SourceSansPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Source Sans Pro';font-style:italic;font-weight:700;src:local('Source Sans Pro Bold Italic'),local('SourceSansPro-BoldItalic'),url("../font/SourceSansPro-BoldItalic-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:400;src:local('Source Code Pro'),local('SourceCodePro-Regular'),url("../font/SourceCodePro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Source Code Pro';font-style:normal;font-weight:700;src:local('Source Code Pro Bold'),local('SourceCodePro-Bold'),url("../font/SourceCodePro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:400;src:local('Inconsolata'),url("../font/Inconsolata-Regular-webfont.woff") format('woff')}@font-face{font-family:'Inconsolata';font-style:normal;font-weight:700;src:local('Inconsolata Bold'),local('Inconsolata-Bold'),url("../font/Inconsolata-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:400;src:local('Anonymous Pro'),local('AnonymousPro'),url("../font/AnonymousPro-Regular-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:normal;font-weight:700;src:local('Anonymous Pro Bold'),local('AnonymousPro-Bold'),url("../font/AnonymousPro-Bold-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:400;src:local('Anonymous Pro Italic'),local('AnonymousPro-Italic'),url("../font/AnonymousPro-Italic-webfont.woff") format('woff')}@font-face{font-family:'Anonymous Pro';font-style:italic;font-weight:700;src:local('Anonymous Pro Bold Italic'),local('AnonymousPro-BoldItalic'),url("../font/AnonymousPro-BoldItalic-webfont.woff") format('woff')}.container{margin-bottom:180px}
->>>>>>> 754d9153095ec89be57ca8bd2144ddbac1b0eebb
 a code{color:inherit}
 h1{font-size:2.6em}
 h2{font-size:2.15em}
@@ -1245,6 +1241,7 @@ pre{word-break:break-word}
 p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em}
 hr{margin:2em 0}
 code,pre{font-family:"Source Code Pro",monospace;font-size:0.9em}
+code{white-space:normal}
 pre,pre.prettyprint{border:0 solid rgba(143,134,104,0.075);border-left:10px solid rgba(143,134,104,0.075);border-radius:0;border-top-right-radius:5px;border-bottom-right-radius:5px;padding:10px 15px}pre code,pre.prettyprint code{background-color:transparent !important}
 dt,dd{margin-top:5px;margin-bottom:5px}
 dd{margin-left:40px}
@@ -1300,10 +1297,10 @@ div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px}
 div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em}
 div.jGrowl div.jGrowl-notification div.jGrowl-close{z-index:99;float:right;font-weight:bold;font-size:1em;cursor:pointer}
 div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:bold;text-align:center}
-@media print{div.jGrowl{display:none}}html,body{overflow:hidden}
+@media print{div.jGrowl{display:none}}body{tab-size:4}
-body{position:absolute;top:0;left:0;bottom:0;right:0;tab-size:4}
 *{outline:none !important}
 .working{cursor:progress}
+.dragging{cursor:move !important}
 .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}
 .dropdown-menu,.modal-content,.panel-content,.search-bar,.popover{-webkit-box-shadow:0 4px 16px rgba(0,0,0,0.225);box-shadow:0 4px 16px rgba(0,0,0,0.225)}
 .dropdown-menu>li>a{padding:5px 20px;border-top:1px solid transparent;border-bottom:1px solid transparent}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{border-color:rgba(121,121,121,0.1)}
@@ -1396,12 +1393,16 @@ a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:r
 .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0}
 .extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}
 .extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}
-.extension-preview-buttons{position:absolute;z-index:10;right:45px;bottom:6px;background-color:#f1f0ec;border:1px solid rgba(121,121,121,0.08);border-radius:4px;-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons{position:absolute;right:0;bottom:0;z-index:40;background-color:#f1f0ec;border:1px solid rgba(121,121,121,0.08);border-radius:4px;cursor:move}.extension-preview-buttons.animate{-webkit-transition:-webkit-transform 350ms ease-in-out;-moz-transition:-moz-transform 350ms ease-in-out;-o-transition:-o-transform 350ms ease-in-out;transition:transform 350ms ease-in-out}
-.extension-preview-buttons .dropdown-menu{margin-bottom:6px;padding-bottom:20px}
+.extension-preview-buttons .btn-group .btn{position:initial;border:0}
+.extension-preview-buttons .dropdown-menu{margin-top:6px;margin-bottom:6px;padding-bottom:20px}
 .extension-preview-buttons hr{margin:0}
 .extension-preview-buttons .markdown-syntax,.extension-preview-buttons .table-of-contents{overflow-y:auto;overflow-x:hidden;padding-right:20px;margin-right:-20px;width:330px}
 .extension-preview-buttons .markdown-syntax{white-space:normal}
 .extension-preview-buttons .table-of-contents{padding:20px 0 15px;margin-left:-10px}.extension-preview-buttons .table-of-contents ul{margin-left:10px;padding-left:10px}
+.extension-preview-buttons .stat-button .value{vertical-align:text-top}
+.extension-preview-buttons .drag-me{color:rgba(143,134,104,0.35)}.extension-preview-buttons .drag-me.info-tooltip{color:#2d2d2d}
+.extension-preview-buttons .drag-me i:before{width:5px}
 .modal-settings .modal-header{padding-bottom:0}
 .modal-settings textarea{max-width:100%;min-height:100px}
 .modal-settings .panel{border:0;border-radius:inherit;background:#fff;border-bottom:1px solid #eee;-webkit-box-shadow:none;box-shadow:none}

public/res/constants.js

@@ -1,6 +1,6 @@
 define([], function() {
     var constants = {};
-    constants.VERSION = "3.99.1";
+    constants.VERSION = "3.99.2";
     constants.MAIN_URL = "https://stackedit.io/";
     constants.GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1";
     constants.GOOGLE_API_KEY = "AIzaSyAeCU8CGcSkn0z9js6iocHuPBX4f_mMWkw";

public/res/extensions/dialogManagePublication.js

@@ -31,16 +31,8 @@ define([
                 publishDesc: formattedAttributes
             });
         }, '');
-        publishListElt.innerHTML = publishListHtml;
         
-        _.each(publishListElt.querySelectorAll('.remove-button'), function(removeButtonElt) {
+        publishListElt.innerHTML = publishListHtml;
-            var $removeButtonElt = $(removeButtonElt);
-            var publishAttributes = fileDesc.publishLocations[$removeButtonElt.data('publishIndex')];
-            $removeButtonElt.click(function() {
-                fileDesc.removePublishLocation(publishAttributes);
-                eventMgr.onPublishRemoved(fileDesc, publishAttributes);
-            });
-        });
     };
 
     dialogManagePublication.onFileSelected = function(fileDescParameter) {
@@ -56,6 +48,13 @@ define([
         publishListElt = modalElt.querySelector(".publish-list");
 
         $showAlreadyPublishedElt = $(document.querySelectorAll(".show-already-published"));
+
+        $(publishListElt).on('click', '.remove-button', function() {
+            var $removeButtonElt = $(this);
+            var publishAttributes = fileDesc.publishLocations[$removeButtonElt.data('publishIndex')];
+            fileDesc.removePublishLocation(publishAttributes);
+            eventMgr.onPublishRemoved(fileDesc, publishAttributes);
+        });
     };
 
     return dialogManagePublication;

public/res/extensions/dialogManageSynchronization.js

@@ -33,16 +33,8 @@ define([
                 syncDesc: syncAttributes.id || syncAttributes.path
             });
         }, '');
-        syncListElt.innerHTML = syncListHtml;
         
-        _.each(syncListElt.querySelectorAll('.remove-button'), function(removeButtonElt) {
+        syncListElt.innerHTML = syncListHtml;
-            var $removeButtonElt = $(removeButtonElt);
-            var syncAttributes = fileDesc.syncLocations[$removeButtonElt.data('syncIndex')];
-            $removeButtonElt.click(function() {
-                fileDesc.removeSyncLocation(syncAttributes);
-                eventMgr.onSyncRemoved(fileDesc, syncAttributes);
-            });
-        });
     };
 
     dialogManageSynchronization.onFileSelected = function(fileDescParameter) {
@@ -58,6 +50,13 @@ define([
         syncListElt = modalElt.querySelector(".sync-list");
 
         $showAlreadySynchronizedElt = $(document.querySelectorAll(".show-already-synchronized"));
+
+        $(syncListElt).on('click', '.remove-button', function() {
+            var $removeButtonElt = $(this);
+            var syncAttributes = fileDesc.syncLocations[$removeButtonElt.data('syncIndex')];
+            fileDesc.removeSyncLocation(syncAttributes);
+            eventMgr.onSyncRemoved(fileDesc, syncAttributes);
+        });
     };
 
     return dialogManageSynchronization;

public/res/extensions/documentManager.js

@@ -113,12 +113,12 @@ define([
 
     var $liMoveElt;
     var $liDeleteElt;
-    function doActiveButtons() {
+    var doActiveButtons = _.debounce(function() {
         doSelect();
 
         $liMoveElt.toggleClass('disabled', _.size(folderList) === 0 || _.size(selectedDocumentList) === 0);
         $liDeleteElt.toggleClass('disabled', _.size(selectedFolderList) === 0 && _.size(selectedDocumentList) === 0);
-    }
+    }, 50);
 
     var orphanDocumentList;
     var $documentCountElt;
@@ -181,105 +181,6 @@ define([
         });
 
         documentListElt.innerHTML = documentListHtml;
-
-        // Set delete event listeners
-        _.each(documentListElt.querySelectorAll('.button-delete'), function(buttonElt) {
-            var $buttonElt = $(buttonElt);
-            $buttonElt.click(function(e) {
-                e.stopPropagation();
-                var $parentElt = $buttonElt.parent();
-                var folderDesc = folderList[$parentElt.data('folderIndex')];
-                var fileDesc = fileSystem[$parentElt.data('fileIndex')];
-                selectedDocumentList = [];
-                selectedFolderList = [];
-                if(folderDesc) {
-                    selectedFolderList.push(folderDesc);
-                    selectedDocumentList = folderDesc.fileList;
-                }
-                else if(fileDesc) {
-                    selectedDocumentList.push(fileDesc);
-                }
-                doDeleteConfirmation();
-            });
-        });
-
-        // Set rename event listeners
-        _.each(documentListElt.querySelectorAll('.button-rename'), function(buttonElt) {
-            var $buttonElt = $(buttonElt);
-            $buttonElt.click(function(e) {
-                e.stopPropagation();
-                var $parentElt = $buttonElt.parent();
-                var name;
-                var folderDesc = folderList[$parentElt.data('folderIndex')];
-                var fileDesc = fileSystem[$parentElt.data('fileIndex')];
-                if(folderDesc) {
-                    name = folderDesc.name;
-                }
-                else if(fileDesc) {
-                    name = fileDesc.title;
-                }
-                $parentElt.find('.name').addClass('hide');
-                $parentElt.find('.input-rename').removeClass('hide').val(name)[0].select();
-            });
-        });
-        _.each(documentListElt.querySelectorAll('.input-rename'), function(inputElt) {
-            var $inputElt = $(inputElt);
-            function rename() {
-                var parentElt = $inputElt.parent();
-                var name = $.trim($inputElt.val());
-                var folderDesc = folderList[parentElt.data('folderIndex')];
-                var fileDesc = fileSystem[parentElt.data('fileIndex')];
-                if(name && folderDesc && name != folderDesc.name) {
-                    folderDesc.name = name;
-                    eventMgr.onFoldersChanged();
-                }
-                else if(name && fileDesc && name != fileDesc.title) {
-                    fileDesc.title = name;
-                    eventMgr.onTitleChanged(fileDesc);
-                }
-                else {
-                    $inputElt.addClass('hide');
-                    parentElt.find('.name').removeClass('hide');
-                }
-            }
-            $inputElt.blur(function() {
-                rename();
-            }).keyup(function(e) {
-                if(e.keyCode == 13) {
-                    rename();
-                    e.stopPropagation();
-                }
-                if(e.keyCode == 27) {
-                    $inputElt.val('');
-                    rename();
-                    e.stopPropagation();
-                }
-            });
-        });
-
-        // Set file checkbox behavior
-        _.each(documentListElt.querySelectorAll('.file .checkbox'), function(checkboxElt) {
-            var $checkboxElt = $(checkboxElt);
-            $checkboxElt.click(function(e) {
-                e.stopPropagation();
-            }).find('[type=checkbox]').change(function() {
-                $checkboxElt.parents('.list-group').find('.folder [type=checkbox]').prop('checked', false);
-            });
-        });
-
-        // Set folder checkbox behavior
-        _.each(documentListElt.querySelectorAll('.folder .checkbox'), function(checkboxElt) {
-            var $checkboxElt = $(checkboxElt);
-            $checkboxElt.click(function(e) {
-                e.stopPropagation();
-            }).find('[type=checkbox]').change(function() {
-                $checkboxElt.parent().next().find('[type=checkbox]').prop('checked', this.checked);
-            });
-        });
-
-        // Set checkbox event listeners
-        $(documentListElt.querySelectorAll('[type=checkbox]')).change(doActiveButtons);
-
     }, 50);
 
     documentManager.onFileCreated = refreshManager;
@@ -423,6 +324,85 @@ define([
             $(modalElt.querySelectorAll('.document-list')).removeClass('hide');
             $(modalElt.querySelectorAll('.confirm-delete, .choose-folder, .selected-document-list, .select-folder-list')).addClass('hide');
         });
+
+        $(documentListElt).on('click', '.button-delete', function(evt) {
+            evt.stopPropagation();
+            var $buttonElt = $(this);
+            var $parentElt = $buttonElt.parent();
+            var folderDesc = folderList[$parentElt.data('folderIndex')];
+            var fileDesc = fileSystem[$parentElt.data('fileIndex')];
+            selectedDocumentList = [];
+            selectedFolderList = [];
+            if(folderDesc) {
+                selectedFolderList.push(folderDesc);
+                selectedDocumentList = folderDesc.fileList;
+            }
+            else if(fileDesc) {
+                selectedDocumentList.push(fileDesc);
+            }
+            doDeleteConfirmation();
+
+        }).on('click', '.button-rename', function(evt) {
+            evt.stopPropagation();
+            var $parentElt = $(this.parentNode);
+            var name;
+            var folderDesc = folderList[$parentElt.data('folderIndex')];
+            var fileDesc = fileSystem[$parentElt.data('fileIndex')];
+            if(folderDesc) {
+                name = folderDesc.name;
+            }
+            else if(fileDesc) {
+                name = fileDesc.title;
+            }
+            $parentElt.find('.name').addClass('hide');
+            $parentElt.find('.input-rename').removeClass('hide').val(name)[0].select();
+
+        }).on('blur keyup', '.input-rename', function(evt) {
+            var $inputElt = $(this);
+            function rename() {
+                var parentElt = $inputElt.parent();
+                var name = $.trim($inputElt.val());
+                var folderDesc = folderList[parentElt.data('folderIndex')];
+                var fileDesc = fileSystem[parentElt.data('fileIndex')];
+                if(name && folderDesc && name != folderDesc.name) {
+                    folderDesc.name = name;
+                    eventMgr.onFoldersChanged();
+                }
+                else if(name && fileDesc && name != fileDesc.title) {
+                    fileDesc.title = name;
+                    eventMgr.onTitleChanged(fileDesc);
+                }
+                else {
+                    $inputElt.addClass('hide');
+                    parentElt.find('.name').removeClass('hide');
+                }
+            }
+            // Blur event
+            if(evt.keyCode === undefined) {
+                rename();
+            }
+            // Enter key event
+            else if(evt.keyCode == 13) {
+                rename();
+                evt.stopPropagation();
+            }
+            // Escape key event
+            else if(evt.keyCode == 27) {
+                $inputElt.val('');
+                rename();
+                evt.stopPropagation();
+            }
+        }).on('click', '.file .checkbox', function(evt) {
+            evt.stopPropagation();
+        }).on('change', '.file .checkbox input', function() {
+            $(this).parents('.file-list').prev().find('.checkbox input').prop('checked', false);
+            doActiveButtons();
+        }).on('click', '.folder .checkbox', function(evt) {
+            evt.stopPropagation();
+        }).on('change', '.folder .checkbox input', function() {
+            $(this).parents('.folder').next().find('.checkbox input').prop('checked', this.checked);
+            doActiveButtons();
+        });
     };
 
     return documentManager;

public/res/extensions/documentPanel.js

@@ -96,17 +96,6 @@ define([
 
         documentListFilteredElt.innerHTML = documentListFilteredHtml;
 
-        // Add click listeners
-        _.each(panelElt.querySelectorAll('.file'), function(fileElt) {
-            var $fileElt = $(fileElt);
-            $fileElt.click(function() {
-                var fileDesc = fileSystem[$fileElt.data('fileIndex')];
-                if(fileDesc && fileDesc !== selectedFileDesc) {
-                    fileMgr.selectFile(fileDesc);
-                }
-            });
-        });
-
     }, 50);
 
     documentPanel.onFileSelected = function(fileDesc) {
@@ -174,6 +163,12 @@ define([
             // Unset the filter
             $filterInputElt.val('');
             filterFiles('');
+        }).on('click', '.file', function() {
+            var $fileElt = $(this);
+            var fileDesc = fileSystem[$fileElt.data('fileIndex')];
+            if(fileDesc && fileDesc !== selectedFileDesc) {
+                fileMgr.selectFile(fileDesc);
+            }
         });
 
         // Search bar input change
@@ -181,6 +176,7 @@ define([
         $filterInputElt.bind("propertychange keyup input paste", function() {
             filterFiles($filterInputElt.val());
         });
+
     };
 
     return documentPanel;

public/res/extensions/documentSelector.js

@@ -64,15 +64,6 @@ define([
             liEltList.push($liElt);
             var fileDesc = fileSystem[$liElt.data('fileIndex')];
             liEltMap[fileDesc.fileIndex] = $liElt;
-            $liElt.find("a").click(function() {
-                selectedLi = undefined;
-                if(!$liElt.hasClass("disabled")) {
-                    fileMgr.selectFile(fileDesc);
-                }
-                else {
-                    $editorElt.focus();
-                }
-            });
         });
     }, 50);
 
@@ -160,6 +151,18 @@ define([
                 selectedLi.find("a").click();
             }
         }, "keyup");
+
+        $dropdownElt.on('click', 'a', function() {
+            selectedLi = undefined;
+            var $liElt = $(this.parentNode);
+            var fileDesc = fileSystem[$liElt.data('fileIndex')];
+            if(!$liElt.hasClass("disabled")) {
+                fileMgr.selectFile(fileDesc);
+            }
+            else {
+                $editorElt.focus();
+            }
+        });
     };
 
     return documentSelector;

public/res/html/bodyIndex.html

@@ -64,7 +64,7 @@
 		</div>
 		<div class="extension-preview-buttons">
 			<div class="btn-group drag-me" title="Drag me!">
-				<i class="icon-menu"></i>
+				<i class="icon-ellipsis-vert"></i>
 			</div>
 		</div>
 	</div>

public/res/html/bodyViewer.html

@@ -14,7 +14,7 @@
 						</div>
 					</div>
 				</div>
-				<ul class="nav pull-right">
+				<ul class="nav pull-right right-buttons">
 					<li class="btn-group">
 						<button class="btn btn-success action-edit-document hide"
 							title="Edit this document">
@@ -38,7 +38,7 @@
 						</ul>
 					</li>
 				</ul>
-				<ul class="nav pull-right">
+				<ul class="nav pull-right title-container">
 					<li><div class="working-indicator"></div></li>
 					<li><span class="btn btn-success file-title-navbar"></span></li>
 				</ul>
@@ -54,7 +54,11 @@
 				</div>
 			</div>
 		</div>
-		<div class="extension-preview-buttons"></div>
+		<div class="extension-preview-buttons">
+			<div class="btn-group drag-me" title="Drag me!">
+				<i class="icon-ellipsis-vert"></i>
+			</div>
+		</div>
 	</div>
 	<div id="wmd-button-bar" class="hide"></div>
 

public/res/layout.js

@@ -362,9 +362,20 @@ define([
 
         onResize();
     }
-    layout.resizeAll = resizeAll;
 
     layout.init = function() {
+
+        // Tweak the body element
+        (function(bodyStyle) {
+            bodyStyle.position = 'absolute';
+            bodyStyle.top = 0;
+            bodyStyle.left = 0;
+            bodyStyle.bottom = 0;
+            bodyStyle.right = 0;
+            bodyStyle.overflow = 'hidden';
+        })(document.body.style);
+        document.documentElement.style.overflow = 'hidden';
+
         wrapperL1 = new DomObject('.layout-wrapper-l1');
         wrapperL2 = new DomObject('.layout-wrapper-l2');
         wrapperL3 = new DomObject('.layout-wrapper-l3');
@@ -413,19 +424,6 @@ define([
         previewPanel.halfSize = true;
         previewToggler.$elt.click(_.bind(previewPanel.toggle, previewPanel));
 
-/*
-        // Hide extension buttons when preview is closed
-        previewPanel.$elt.on('hide.layout.toggle', function() {
-            previewButtons.bottom = 99999;
-            previewButtons.applyCss();
-        });
-
-        // Show extension buttons when preview is open
-        previewPanel.$elt.on('shown.layout.toggle', function() {
-            previewButtons.bottom = 6;
-            previewButtons.applyCss();
-        });
-*/
         // Open StackEdit Viewer if failing to open the preview
         previewPanel.$elt.on('show.layout.toggle', function() {
             _.defer(function() {
@@ -502,42 +500,42 @@ define([
                 previewPanel.halfSize = false;
                 resizeAll();
             });
-
-            previewButtons.initHammer(true);
-            previewButtons.adjustPosition = function() {
-                if(!previewButtons.isDragged) {
-                    return;
-                }
-                var minX = -windowSize.width + previewButtons.elt.offsetWidth;
-                var minY = -windowSize.height + previewButtons.elt.offsetHeight;
-                this.x < minX && (this.x = minX);
-                this.y < minY && (this.y = minY);
-                this.x > 0 && (this.x = 0);
-                this.y > 0 && (this.y = 0);
-                this.applyCss();
-            };
-
-
-            var buttonsInitialCoord;
-            previewButtons.hammer.on('dragstart', function() {
-                previewButtons.isDragged = true;
-                previewButtons.$elt.removeClass('animate');
-                wrapperL2.$elt.addClass('dragging');
-                buttonsInitialCoord = {
-                    x: previewButtons.x,
-                    y: previewButtons.y
-                };
-            }).on('drag', function(evt) {
-                previewButtons.x = buttonsInitialCoord.x + evt.gesture.deltaX;
-                previewButtons.y = buttonsInitialCoord.y + evt.gesture.deltaY;
-                previewButtons.adjustPosition();
-                evt.gesture.preventDefault();
-            }).on('dragend', function() {
-                wrapperL2.$elt.removeClass('dragging');
-                previewButtons.$elt.find('.btn-group').toggleClass('dropup', windowSize.height/2 > -previewButtons.y);
-            });
         }
 
+        previewButtons.initHammer(true);
+        previewButtons.adjustPosition = function() {
+            if(!previewButtons.isDragged) {
+                return;
+            }
+            var minX = -windowSize.width + previewButtons.elt.offsetWidth;
+            var minY = -windowSize.height + previewButtons.elt.offsetHeight;
+            this.x < minX && (this.x = minX);
+            this.y < minY && (this.y = minY);
+            this.x > 0 && (this.x = 0);
+            this.y > 0 && (this.y = 0);
+            this.applyCss();
+        };
+
+
+        var buttonsInitialCoord;
+        previewButtons.hammer.on('dragstart', function() {
+            previewButtons.isDragged = true;
+            previewButtons.$elt.removeClass('animate');
+            wrapperL2.$elt.addClass('dragging');
+            buttonsInitialCoord = {
+                x: previewButtons.x,
+                y: previewButtons.y
+            };
+        }).on('drag', function(evt) {
+            previewButtons.x = buttonsInitialCoord.x + evt.gesture.deltaX;
+            previewButtons.y = buttonsInitialCoord.y + evt.gesture.deltaY;
+            previewButtons.adjustPosition();
+            evt.gesture.preventDefault();
+        }).on('dragend', function() {
+            wrapperL2.$elt.removeClass('dragging');
+            previewButtons.$elt.find('.btn-group').toggleClass('dropup', windowSize.height/2 > -previewButtons.y);
+        });
+
         var isModalShown = false;
         $('.modal').on('show.bs.modal', function() {
             // Close panel if open
@@ -610,15 +608,13 @@ define([
             }, 3000);
         }
 
-        if(!window.viewerMode) {
+        closePreviewButtons();
+        previewButtons.$elt.hover(openPreviewButtons, closePreviewButtons).on('show.bs.dropdown', function() {
+            dropdownOpen = true;
+        }).on('hidden.bs.dropdown', function() {
+            dropdownOpen = false;
             closePreviewButtons();
-            previewButtons.$elt.hover(openPreviewButtons, closePreviewButtons).on('show.bs.dropdown', function() {
+        });
-                dropdownOpen = true;
-            }).on('hidden.bs.dropdown', function() {
-                dropdownOpen = false;
-                closePreviewButtons();
-            });
-        }
 
         _.each(previewButtons.elt.querySelectorAll('.btn-group'), function(btnGroupElt) {
             var $btnGroupElt = $(btnGroupElt);

public/res/styles/base.less

@@ -135,6 +135,10 @@ code, pre {
     font-size: 0.9em;
 }
 
+code {
+    white-space: normal;
+}
+
 pre, pre.prettyprint {
 	border: 0 solid @pre-border-color;
     border-left: 10px solid @pre-border-color;

public/res/styles/main.less

@@ -140,14 +140,7 @@
 @state-danger-border: fade(spin(@logo-orange, -4), 20%);
 
 
-html, body {
-	overflow: hidden;
-}
-
 body {
-	.layout-panel();
-	bottom: 0;
-	right: 0;
 	tab-size: 4;
 }
 
@@ -816,10 +809,12 @@ a {
 	position: absolute;
 	right: 0;
 	bottom: 0;
-	z-index: 30;
+	z-index: 40;
 	background-color: @btn-info-hover-bg;
 	border: 1px solid @btn-info-hover-border;
 	border-radius: @border-radius-base;
+	cursor: move;
+
 	&.animate {
 		.transition-transform(350ms ease-in-out);
 	}
@@ -866,15 +861,11 @@ a {
 
 	.drag-me {
 		color: @btn-info-color;
-		cursor: move;
 		&.info-tooltip {
 			color: @btn-info-hover-color;
 		}
-		i {
+		i:before {
-			overflow: hidden;
+			width: 5px;
-			&:before {
-				width: 5px;
-			}
 		}
 	}
 }

public/res/worker.js

@@ -1,15 +0,0 @@
-/*jshint worker:true */
-var isConfigured = false;
-
-self.onmessage = function(e) {
-    if(isConfigured === false) {
-        /*jshint evil:true */
-        eval(e.data);
-        isConfigured = true;
-    }
-    else {
-        var data = JSON.parse(e.data);
-        var functionName = data.shift();
-        self[functionName].apply(this, data);
-    }
-};

public/res/workers/spellCheckWorker.js

@@ -1,39 +0,0 @@
-/*jshint worker:true */
-var dictionary;
-
-/*jshint evil:true, unused:false */
-self.init = function(typoJS, LZString, lang, aff, dic) {
-    eval([
-        typoJS,
-        LZString,
-        'aff = LZString.decompressFromUTF16(aff);',
-        'dic = LZString.decompressFromUTF16(dic);',
-        'dictionary = new Typo(lang, aff, dic);'
-    ].join('\n'));
-};
-/*jshint evil:false, unused:true */
-
-var timeoutId;
-self.check = function(words) {
-    // Check function has priority over Suggest function
-    // This prevents Suggest to run if called just before Check
-    timeoutId && clearTimeout(timeoutId);
-    for (var i = 0; i < words.length; i++) {
-        var word = words[i];
-        word.check = dictionary.check(word.value);
-    }
-    postMessage(JSON.stringify(['check', words]));
-};
-
-var word;
-
-function delayedSuggest() {
-    timeoutId = undefined;
-    var suggestions = dictionary.suggest(word);
-    postMessage(JSON.stringify(['suggest', suggestions]));
-}
-
-self.suggest = function(wordParam) {
-    word = wordParam;
-    timeoutId = setTimeout(delayedSuggest, 50);
-};