Merge branch 'main' into staging

customize.dist/src/less2/include/colortheme-dark.less

@@ -387,6 +387,7 @@
 // Rich text
 @cp_pad-fg: @cryptpad_text_col;
 @cp_pad-icon-filter: invert();
+@cp_pad-resize: @cryptpad_color_grey_800;
 // Comments
 @cp_comments-fg: @cryptpad_text_col;
 @cp_comments-bg: @cryptpad_color_grey_800;

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

@@ -387,6 +387,7 @@
 // Rich text
 @cp_pad-fg: @cryptpad_text_col;
 @cp_pad-icon-filter: none;
+@cp_pad-resize: @cryptpad_text_col;
 // Comments
 @cp_comments-fg: @cryptpad_text_col;
 @cp_comments-bg: @cryptpad_color_white;

www/pad/app-pad.less

@@ -68,6 +68,10 @@ body.cp-app-pad {
         margin-left: -40px;
         margin-top: 10px;
         margin-right: 0;
+        button {
+            color: @cp_pad-resize;
+            border-color: @cp_pad-resize;
+        }
         &.hidden {
             margin-left: -70px;
             margin-right: 40px;

www/pad/inner.js

@@ -1406,7 +1406,7 @@ define([
                 $ckeToolbar.find('.cke_button__image_icon').parent().hide();
 
                 var $iframe = $('iframe').contents();
-                if (window.CryptPad_theme === 'dark') {
+                /*if (window.CryptPad_theme === 'dark') {
                     $iframe.find('html').addClass('cp-dark').css({
                         'background-color': '#323232', // grey_850
                         'color': '#EEEEEE' // dark text_col
@@ -1415,7 +1415,10 @@ define([
                     $iframe.find('html').css({
                         'background-color': '#FFF'
                     });
-                }
+                }*/
+                $iframe.find('html').css({
+                    'background-color': '#FFF'
+                });
             }).nThen(waitFor());
 
         }).nThen(function(waitFor) {