From 11d33888886bfde6cdbcfb5ef0ea91ec4b636099 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 24 Mar 2025 11:09:44 +0100
Subject: [PATCH] Fix btn-default style issue

---
 customize.dist/src/less2/include/colortheme-dark.less |  2 ++
 customize.dist/src/less2/include/colortheme.less      |  2 ++
 customize.dist/src/less2/include/forms.less           | 11 ++++++++++-
 www/kanban/inner.js                                   |  6 +++---
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index ed31b18b6..609eadd88 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -162,7 +162,9 @@
 // Buttons
 @cp_buttons-fg: @cryptpad_color_brand_300;
 @cp_buttons-hover: @cryptpad_color_brand_fadest;
+@cp_buttons-default: @cryptpad_color_grey_700;
 @cp_buttons-default-color: @cryptpad_text_col;
+@cp_buttons-default-border: @cryptpad_text_col;
 @cp_buttons-default-bg: @cryptpad_text_col;
 @cp_buttons-default-fg: @cryptpad_color_grey_900;
 @cp_buttons-default-alt-bg: @cryptpad_color_grey_900;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 316f1d06c..cb3b2e2dc 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -161,7 +161,9 @@
 // Buttons
 @cp_buttons-fg: @cryptpad_color_brand;
 @cp_buttons-hover: @cryptpad_color_brand_fadest;
+@cp_buttons-default: #CCC;
 @cp_buttons-default-color: @cryptpad_text_col;
+@cp_buttons-default-border: @cryptpad_text_col;
 @cp_buttons-default-bg: @cryptpad_color_grey_200;
 @cp_buttons-default-fg: @cryptpad_text_col;
 @cp_buttons-default-alt-bg: @cryptpad_color_white;
diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index e2e96f4a3..dedf7f74d 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -191,6 +191,15 @@
         }
 
         &.btn-default {
+            border-color: @cp_buttons-default-border;
+            color: @cp_buttons-default-color;
+            &:hover, &:not(:disabled):active, &:focus {
+                border-color: @cp_buttons-default-border;
+                color: @cp_buttons-default-color;
+                background-color: @cp_buttons-default;
+            }
+        }
+        &.btn-toolbar {
             background-color: @cp_buttons-default-bg;
             color: @cp_buttons-default-fg;
             border-color: @cp_buttons-default-bg;
@@ -200,7 +209,7 @@
                 color: @cryptpad_text_col;
             }
         }
-        &.btn-default-alt {
+        &.btn-toolbar-alt {
             border-color: @cp_buttons-default-alt-fg;
             color: @cp_buttons-default-alt-fg;
             background-color: @cp_buttons-default-alt-bg;
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 7f9fbdad4..cdd22176c 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1186,7 +1186,7 @@ define([
                 commitTags();
             });
 
-            let toggleTagsButton = h('button.btn.btn-default-alt.cp-kanban-toggle-tags', [
+            let toggleTagsButton = h('button.btn.btn-toolbar-alt.cp-kanban-toggle-tags', [
                 h('i.fa.fa-tags'),
                 h('span', Messages.fm_tagsName)
             ]);
@@ -1199,8 +1199,8 @@ define([
                 $tags.toggle();
                 let visible = $tags.is(':visible');
                 $(toggleContainer).toggleClass('cp-kanban-container-flex', !visible);
-                $toggleBtn.toggleClass('btn-default-alt', visible);
-                $toggleBtn.toggleClass('btn-default', !visible);
+                $toggleBtn.toggleClass('btn-toolbar-alt', visible);
+                $toggleBtn.toggleClass('btn-toolbar', !visible);
             };
             $toggleBtn.click(function() {
                 toggleClicked = true;