From cbfee93c3a3839ab776aef67b860eb5e0aca9e8a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 7 Mar 2025 17:53:43 +0100
Subject: [PATCH] Fix kanban tags issues

---
 .../src/less2/include/colortheme-dark.less           |  2 +-
 customize.dist/src/less2/include/colortheme.less     |  1 +
 customize.dist/src/less2/include/forms.less          |  4 ++--
 www/kanban/app-kanban.less                           |  8 --------
 www/kanban/inner.js                                  | 12 ++++++++++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index 1e9916267..1f5aee211 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -164,7 +164,7 @@
 @cp_buttons-hover: @cryptpad_color_brand_fadest;
 @cp_buttons-default: @cryptpad_color_grey_700;
 @cp_buttons-default-color: @cryptpad_text_col;
-@cp_buttons-default-alt-color: @cryptpad_color_black;
+@cp_buttons-default-alt-color: @cryptpad_color_grey_700;
 @cp_buttons-default-border: @cryptpad_text_col;
 @cp_buttons-red: #E55236;
 @cp_buttons-red-text: @cryptpad_color_light_red;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index faaca5285..ece9f6fe0 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -164,6 +164,7 @@
 @cp_buttons-default: #CCC;
 @cp_buttons-default-color: @cryptpad_text_col;
 @cp_buttons-default-border: @cryptpad_text_col;
+@cp_buttons-default-alt-color: @cryptpad_color_grey_50;
 @cp_buttons-red: #E55236;
 @cp_buttons-red-text: @cp_buttons-red;
 @cp_buttons-red-color: #FFF;
diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 61cc999b2..745d24ab0 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -200,8 +200,8 @@
             }
         }
         &.btn-default-alt {
-            border-color: @cp_toolbar-bottom-fg;
-            color: @cp_toolbar-bottom-fg;
+            border-color: @cp_buttons-default-alt-color;
+            color: @cp_buttons-default-alt-color;
             background-color: @cp_buttons-default-color;
             &:hover, &:not(:disabled):active, &:focus {
                 border-color: @cp_buttons-default-color;
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 4a81b68b2..b050791b7 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -454,16 +454,8 @@
                 }
                 flex-flow: column;
                 flex-shrink: 0;
-                & > * {
-                    visibility: hidden;
-                }
                 & > span {
                     display: inline-block;
-                    height: 38px;
-                    line-height: 38px;
-                }
-                & > button {
-                    margin-top: -38px;
                 }
             }
             button.cp-kanban-filterTags-reset {
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 425f859b4..df9a676f1 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -933,9 +933,9 @@ define([
             // Tags filter
             var existing = getExistingTags(kanban.options.boards);
             var list = h('div.cp-kanban-filterTags-list');
-            var reset = h('button.btn.btn-cancel.cp-kanban-filterTags-reset', [
+            var reset = h('button.btn.btn-cancel.cp-kanban-filterTags-reset.cp-kanban-toggle-tags', [
                 h('i.fa.fa-times'),
-                Messages.kanban_clearFilter
+                h('span', Messages.kanban_clearFilter)
             ]);
             var hint = h('span.cp-kanban-filterTags-name', Messages.kanban_tags);
             var tags = h('div.cp-kanban-filterTags', [
@@ -951,8 +951,16 @@ define([
             var $hint = $(hint);
 
             var setTagFilterState = function (bool) {
+                //$hint.toggle(!bool);
+                //$reset.toggle(!!bool);
                 $hint.css('visibility', bool? 'hidden': 'visible');
+                $hint.css('height', bool ? 0 : '');
+                $hint.css('padding-top', bool ? 0 : '');
+                $hint.css('padding-bottom', bool ? 0 : '');
                 $reset.css('visibility', bool? 'visible': 'hidden');
+                $reset.css('height', !bool ? 0 : '');
+                $reset.css('padding-top', !bool ? 0 : '');
+                $reset.css('padding-bottom', !bool ? 0 : '');
             };
             setTagFilterState();