From d257dbab3f8f587b6bd06da50c5a62d466fd5b06 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Wed, 14 May 2025 13:24:05 +0300
Subject: [PATCH] Minor fixes + add label to all buttons #1831

---
 www/common/common-ui-elements.js | 6 +++++-
 www/form/app-form.less           | 4 +---
 www/form/inner.js                | 1 -
 www/kanban/app-kanban.less       | 5 -----
 www/profile/inner.js             | 2 --
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 02a351a10..938746da9 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1343,7 +1343,7 @@ define([
 
     UIElements.createMarkdownToolbarToggle = function(toolbarElement, editor) {
         var $button = $('<button>', {
-            'class': 'btn btn-toolbar-alt cp-markdown-toolbar-toggle-button',
+            'class': 'btn cp-markdown-toolbar-toggle-button',
             'aria-label': Messages.toolbar_tools,
             'data-notippy':1,
             'title': Messages.toolbar_tools,
@@ -1353,6 +1353,10 @@ define([
             $('<i>', {
                 'class': 'fa fa-wrench',
                 'aria-hidden': true
+            }),
+            $('<span>', {
+                'class': 'cp-toolbar-label',
+                'text': Messages.toolbar_tools
             })
         );
     
diff --git a/www/form/app-form.less b/www/form/app-form.less
index e092ed67c..cd74d4aa6 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -443,9 +443,6 @@
                             border-radius: @variables_radius;
                             display: inline-flex;
                         }
-                        .cp-markdown-toolbar-toggle-button i.fa {
-                            margin: 0 !important;
-                        }
                     }
                 }
 
@@ -840,6 +837,7 @@
                     border: 1px solid @cp_forms-border;
                     border-radius: @variables_radius;
                     margin-top: 0.5rem;
+                    padding: 1px; 
                     .CodeMirror {
                         cursor: default;
                         flex: 1;
diff --git a/www/form/inner.js b/www/form/inner.js
index d30cc744d..bc73bc7dd 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1127,7 +1127,6 @@ define([
                             });
                             var toggleRow = h('div.cp-markdown-toggle-row');
                             $(block).prepend(markdownTb.toolbar);
-                            UIElements.updateToolbarVisibility(toggleRow, markdownTb.toolbar, editor);
                             $(window).on('resize', function() {
                                 UIElements.updateToolbarVisibility(toggleRow, markdownTb.toolbar, editor);
                             });
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 4e909c07b..5f4edd6d4 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -142,11 +142,6 @@
         border-radius: @variables_radius;
         display: inline-flex;
     }
-
-    .cp-markdown-toolbar-toggle-button i.fa {
-        margin: 0 !important;
-    }
-        
     #cp-kanban-edit-body {
         border: 1px solid @cp_forms-border;
         border-radius: @variables_radius;
diff --git a/www/profile/inner.js b/www/profile/inner.js
index 50608fe14..d6557a430 100644
--- a/www/profile/inner.js
+++ b/www/profile/inner.js
@@ -544,8 +544,6 @@ define([
         $(window).on('resize', function() {
             UIElements.updateToolbarVisibility(toggleRow, markdownTb.toolbar, editor);
         });
-        $(toggleButton).removeClass('btn-toolbar-alt');
-        $(toggleButton).append('<span class="toggle-label">Show tools</span>');
         $(code).prepend(markdownTb.toolbar);
         $(code).prepend(toggleRow); 
         if(!Util.isSmallScreen()) {