Merge branch 'soon' into newtoolbar

2017-01-24 12:54:07 +01:00
parent 9d275daebb 141f8f776a
commit ce1e792419
17 changed files with 85 additions and 120 deletions
--- a/www/pad/inner.html
+++ b/www/pad/inner.html
@@ -6,6 +6,9 @@
    <script src="/bower_components/jquery/dist/jquery.min.js"></script>
    <script src="/bower_components/ckeditor/ckeditor.js"></script>
    <style>
+    html, body {
+        margin: 0px;
+    }
    #cke_1_top {
        overflow: visible;
    }