From f24bbacd0ba8c3dd53dba49b0d742e95ee3f9e2c Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Fri, 21 Jun 2024 12:07:40 +0300
Subject: [PATCH] add focus to remove user button

---
 customize.dist/src/less2/include/alertify.less | 2 +-
 customize.dist/src/less2/include/toolbar.less  | 2 +-
 customize.dist/src/less2/include/usergrid.less | 3 ++-
 www/common/common-interface.js                 | 1 -
 www/common/common-ui-elements.js               | 7 +++++--
 www/kanban/app-kanban.less                     | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 3a432ddd3..9d97d82d4 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -198,7 +198,7 @@
                         text-decoration: none;
                     }
                 }
-                .cp-usergrid-user, textarea, a  {
+                .cp-usergrid-user, textarea, a, .fa-times  {
                     outline: none;
                     &:focus {
                         outline: @cryptpad_color_brand solid 2px;
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 05111c6b0..e47b8757c 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -774,7 +774,7 @@
                 padding: 10px;
                 color: @toolbar-bg-color;
                 color: var(--toolbar-bg-color);
-                border-radius: 5px;
+                border-radius: @variables_radius;
 
                 span {
                     font-size: 45px;
diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less
index 475f9cde1..bfddc84a3 100644
--- a/customize.dist/src/less2/include/usergrid.less
+++ b/customize.dist/src/less2/include/usergrid.less
@@ -115,7 +115,8 @@
                 }
             }
             .fa-times {
-                padding-left: 5px;
+                border-radius: @variables_radius;
+                margin-left: 5px;
                 cursor: pointer;
                 height: 100%;
                 line-height: 25px;
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 0fd0b2aad..e26be89aa 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -615,7 +615,6 @@ define([
             else{
                 if (e.which === 9 && !insideColorButtons) {
                     e.preventDefault();
-                    console.log(modalElements);
                     const firstElement = modalElements.first()[0];
                     const lastElement = modalElements.last()[0];
 
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f40459ea6..69cf56543 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -173,8 +173,11 @@ define([
             var removeBtn, el;
             if (config.remove) {
                 removeBtn = h('span.fa.fa-times');
-                $(removeBtn).click(function () {
-                    config.remove(el);
+                $(removeBtn).attr('tabindex', '0');
+                $(removeBtn).on('click keydown', function(event) {
+                    if (event.type === 'click' || (event.type === 'keydown' && event.key === 'Enter')) {
+                        config.remove(el);
+                    }
                 });
             }
 
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 15458e2b4..fe33693d3 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -196,7 +196,7 @@
         background: transparent;
         align-self: flex-start;
         outline-style: none;
-        border-radius: 5px;
+        border-radius: @variables_radius;
         &:focus {
             outline: @cryptpad_color_brand solid 2px;
         }