From 6766378b5eca2943434485a42d834cdc887215a4 Mon Sep 17 00:00:00 2001 From: daria Date: Wed, 26 Mar 2025 11:54:22 +0200 Subject: [PATCH 1/5] add outline style to link #1843 --- customize.dist/src/less2/include/help.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/customize.dist/src/less2/include/help.less b/customize.dist/src/less2/include/help.less index 26d324c20..49e467e67 100644 --- a/customize.dist/src/less2/include/help.less +++ b/customize.dist/src/less2/include/help.less @@ -5,6 +5,7 @@ */ @import (reference) "./colortheme-all.less"; +@import (reference) "./variables.less"; .help_main () { --LessLoader_require: LessLoader_currentFile(); @@ -34,6 +35,10 @@ a { color: @cp_help-link; text-decoration: underline; + &:focus-visible { + outline: @variables_focus_style; + border-radius: @variables_radius; + } } h1 { font-size: 20px; From aeff4b7f1db5669fe964e72b77eaa78e51ae72f7 Mon Sep 17 00:00:00 2001 From: daria Date: Wed, 26 Mar 2025 12:20:49 +0200 Subject: [PATCH 2/5] fix button functionality #1843 --- customize.dist/messages.js | 2 +- customize.dist/src/less2/include/help.less | 6 ++++++ www/common/common-ui-elements.js | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/customize.dist/messages.js b/customize.dist/messages.js index a28190005..7ff0456d8 100755 --- a/customize.dist/messages.js +++ b/customize.dist/messages.js @@ -135,7 +135,7 @@ define(req, function(AppConfig, Default, Language) { }; - + Messages.help_close_button = 'Close help notification'; // XXX return Messages; }); diff --git a/customize.dist/src/less2/include/help.less b/customize.dist/src/less2/include/help.less index 49e467e67..7f07ab360 100644 --- a/customize.dist/src/less2/include/help.less +++ b/customize.dist/src/less2/include/help.less @@ -22,11 +22,17 @@ } .cp-help-close { + background: none; + border: none; position: absolute; color: @cryptpad_text_col; top: 5px; right: 5px; cursor: pointer; + &:focus-visible { + outline: @variables_focus_style; + border-radius: @variables_radius; + } } .cp-help-text { color: @cp_help-fg; diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 62db751d6..a4fedb713 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1279,7 +1279,9 @@ define([ common.fixLinks(text); - var closeButton = h('span.cp-help-close.fa.fa-times'); + var closeButton = h('button.cp-help-close.fa.fa-times', { + title: 'Close help notification' + }); var $toolbarButton = common.createButton('', true, { text: Messages.help_button, name: 'help' From 38345244f091e80d0a069e80676d108b422709ad Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Wed, 26 Mar 2025 12:34:18 +0200 Subject: [PATCH 3/5] add translation key #1843 --- www/common/common-ui-elements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index a4fedb713..87273c960 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1280,7 +1280,7 @@ define([ common.fixLinks(text); var closeButton = h('button.cp-help-close.fa.fa-times', { - title: 'Close help notification' + title: Messages.help_close_button }); var $toolbarButton = common.createButton('', true, { text: Messages.help_button, From 64020ed10673acc612ad7625c7b70a086499b4c3 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Wed, 26 Mar 2025 12:57:20 +0200 Subject: [PATCH 4/5] fix button order #1843 --- customize.dist/src/less2/include/help.less | 1 - www/common/common-ui-elements.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/customize.dist/src/less2/include/help.less b/customize.dist/src/less2/include/help.less index 7f07ab360..b290ef7ac 100644 --- a/customize.dist/src/less2/include/help.less +++ b/customize.dist/src/less2/include/help.less @@ -28,7 +28,6 @@ color: @cryptpad_text_col; top: 5px; right: 5px; - cursor: pointer; &:focus-visible { outline: @variables_focus_style; border-radius: @variables_radius; diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 87273c960..d97222ec3 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1287,8 +1287,8 @@ define([ name: 'help' }).addClass('cp-toolbar-button-active'); var help = h('div.cp-help-container', [ - closeButton, - text + text, + closeButton ]); $toolbarButton.attr('title', Messages.show_help_button); From 5f6356f6c26ddf731fa1ee709228271895428d82 Mon Sep 17 00:00:00 2001 From: daria <95225431+dariiing@users.noreply.github.com> Date: Fri, 20 Jun 2025 11:54:33 +0300 Subject: [PATCH 5/5] remove overflow --- customize.dist/src/less2/include/help.less | 1 - 1 file changed, 1 deletion(-) diff --git a/customize.dist/src/less2/include/help.less b/customize.dist/src/less2/include/help.less index b290ef7ac..dc0c6fc26 100644 --- a/customize.dist/src/less2/include/help.less +++ b/customize.dist/src/less2/include/help.less @@ -16,7 +16,6 @@ position: relative; background-color: @cp_help-bg; max-height: 50%; - overflow-y: auto; &.cp-help-hidden { display: none; }