upgrade docker hub image version to 2024.6.1

.eslintrc.js

@@ -35,7 +35,7 @@ module.exports = {
             4
         ],
         'linebreak-style': [
-            'off',  // git handles linebreak conversion for us
+            'error',
             'unix'
         ],
         'quotes': [

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

@@ -149,8 +149,7 @@
         box-sizing: border-box;
         align-items: center;
         padding: 0 6px;
-        line-height: 20px;
-        padding: 8px 6px;
+        line-height: 36px;
         white-space: nowrap;
         text-align: center;
         text-transform: uppercase;

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

@@ -43,10 +43,13 @@
 
         nav {
             display: flex;
+            align-items: center;
             justify-content: flex-end;
-            align-items: flex-end;
-            .btn-confirm {
-                white-space: normal;
+        }
+
+        @media screen and (max-width: 600px) {
+            nav .btn-danger {
+                line-height: inherit;
             }
         }
 

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

@@ -68,10 +68,13 @@
 
         nav {
             display: flex;
+            align-items: center;
             justify-content: flex-end;
-            align-items: flex-end;
-            .btn-confirm {
-                white-space: normal;
+        }
+
+        @media screen and (max-width: 600px) {
+            nav .btn-danger {
+                line-height: inherit;
             }
         }
 

docker-compose.yml

@@ -5,7 +5,7 @@
 ---
 services:
   cryptpad:
-    image: "cryptpad/cryptpad:version-2024.6.0"
+    image: "cryptpad/cryptpad:version-2024.6.1"
     hostname: cryptpad
 
     environment:

www/common/common-interface.js

@@ -778,6 +778,7 @@ define([
     UI.confirm = function (msg, cb, opt, force) {
         cb = cb || function () {};
         opt = opt || {};
+
         var message;
         if (typeof(msg) === 'string') {
             if (!force) { msg = Util.fixHTML(msg); }

www/install/main.js

@@ -189,7 +189,7 @@ define([
     anywhere else then we can deprecate them and make this a
     custom modal in common-interface (or here).  */
                 cancelClass: 'btn.btn-cancel.btn-register',
-                okClass: 'btn.btn-danger.btn-register.btn-confirm',
+                okClass: 'btn.btn-danger.btn-register',
                 reverseOrder: true,
                 done: function ($dialog) {
                     $dialog.find('> div').addClass('half');

www/register/main.js

@@ -175,7 +175,7 @@ define([
     anywhere else then we can deprecate them and make this a
     custom modal in common-interface (or here).  */
                 cancelClass: 'btn.btn-cancel.btn-register',
-                okClass: 'btn.btn-danger.btn-register.btn-confirm',
+                okClass: 'btn.btn-danger.btn-register',
                 reverseOrder: true,
                 done: function ($dialog) {
                     $dialog.find('> div').addClass('half');

www/settings/app-settings.less

@@ -38,17 +38,6 @@
         margin-left: 0.5rem;
     }
 
-    .alertify {
-        nav {
-            display: flex;
-            justify-content: flex-end;
-            align-items: flex-end;
-            .btn-confirm {
-                white-space: normal;
-            }
-        }
-    }
-
     #cp-sidebarlayout-container {
         #cp-sidebarlayout-rightside {
             input[type="checkbox"] {
@@ -124,11 +113,6 @@
                     margin-left: 10px;
                 }
             }
-            nav {
-                display: flex;
-                justify-content: center;
-                align-items: flex-end;
-            }
             @media (max-width: 840px) {
 
                 .cp-password-container {

www/settings/inner.js

@@ -807,7 +807,7 @@ define([
                 }, {
                     ok: Messages.register_writtenPassword,
                     cancel: Messages.register_cancel,
-                    okClass: 'btn.btn-danger.btn-confirm',
+                    okClass: 'btn.btn-danger',
                     reverseOrder: true,
                     done: function($dialog) {
                         $dialog.find('> div').addClass('half');