resolve merge conflicts and jquery errors

2017-04-24 13:43:18 +02:00
parent 81c5e26a0a 5fc2e4cf71
commit f7e96b4e8c
11 changed files with 459 additions and 11 deletions
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -409,6 +409,31 @@
 .cryptpad-toolbar-rightside {
    text-align: right;
 }
+.cryptpad-toolbar-history {
+    display: none;
+    text-align: center;
+    .next {
+        float: right;
+    }
+    .previous {
+        float: left;
+    }
+    .goto {
+        display: inline-block;
+        input { width: 50px; }
+    }
+    .gotoInput {
+        vertical-align: middle;
+    }
+}
+.cke_toolbox .cryptpad-toolbar-history {
+    input.gotoInput {
+        background: white;
+        height: 20px;
+        padding: 3px 3px;
+        border-radius: 5px;
+    }
+}
 .cryptpad-spinner {
    height: 16px;
    width: 16px;