Merge branch 'staging' into locks

customize.dist/ckeditor-config.js

@@ -28,7 +28,6 @@ CKEDITOR.editorConfig = function( config ) {
 
     config.font_defaultLabel = 'Arial';
     config.fontSize_defaultLabel = '16';
-    config.contentsCss = '/customize/ckeditor-contents.css?' + CKEDITOR.CRYPTPAD_URLARGS;
 
     config.keystrokes = [
         [ CKEDITOR.ALT + 121 /*F10*/, 'toolbarFocus' ],

customize.dist/ckeditor-contents.css

@@ -158,18 +158,20 @@ a > img {
     border: 2px solid red;
     border-right-color: transparent !important;
     border-left-color: transparent !important;
-    margin-left: -2px;
-    margin-right: -2px;
+    margin-left: -3px;
+    margin-right: -3px;
 }
 .cp-cursor-position[data-type="start"] {
     border-left: none;
     border-right-width: 4px;
-    margin-right: -4px;
+    margin-right: -5px;
+    margin-left: -1px;
 }
 .cp-cursor-position[data-type="end"] {
     border-right: none;
     border-left-width: 4px;
-    margin-left: -4px;
+    margin-left: -5px;
+    margin-right: -1px;
 }
 .cp-cursor-avatar {
     display: flex;

customize.dist/pages.js

@@ -91,7 +91,7 @@ define([
                     ])
                 ])
             ]),
-            h('div.cp-version-footer', "CryptPad v2.14.0 (Opossum)")
+            h('div.cp-version-footer', "CryptPad v2.15.0 (Pademelon)")
         ]);
     };
 

customize.dist/pages/index.js

@@ -2,11 +2,12 @@ define([
     'jquery',
     '/api/config',
     '/common/hyperscript.js',
+    '/common/common-feedback.js',
     '/customize/messages.js',
     '/customize/application_config.js',
     '/common/outer/local-store.js',
     '/customize/pages.js'
-], function ($, Config, h, Msg, AppConfig, LocalStore, Pages) {
+], function ($, Config, h, Feedback, Msg, AppConfig, LocalStore, Pages) {
     var urlArgs = Config.requireConf.urlArgs;
 
     var isAvailableType = function (x) {
@@ -84,6 +85,7 @@ define([
 
         $(crowdFunding).click(function () {
             _link.click();
+            Feedback.send('HOME_SUPPORT_CRYPTPAD');
         });
 
         var blocks = h('div.container',[

customize.dist/pages/login.js

@@ -30,7 +30,8 @@ define([
                             UI.createCheckbox('import-recent', Msg.register_importRecent),
                         ]),
                         h('div.extra', [
-                            h('button.login.first.btn', Msg.login_login)
+                            h('button.login.first.btn', Msg.login_login),
+                            h('button#register.first.btn', Msg.login_register)
                         ])
                     ])
                 ]),

customize.dist/src/less2/include/cursor.less

@@ -8,6 +8,8 @@
         border: 2px solid red;
         border-right-color: transparent !important;
         border-left-color: transparent !important;
+        margin-left: -3px;
+        margin-right: -3px;
     }
     .cp-codemirror-selection {
         background-color: rgba(255,0,0,0.3);

customize.dist/src/less2/pages/page-login.less

@@ -61,6 +61,16 @@
                     transform: scale(1.05);
                 }
             }
+            #register {
+                border-color: @cryptpad_color_blue;
+                background: #fff;
+                color: @cryptpad_color_blue;
+                padding: 10px;
+                border-radius: 0;
+                &:hover {
+                    transform: scale(1.05);
+                }
+            }
         }
     }
     .cp-container {