From d1924d6585f6fae73e1fee56d52f15803f50c9bf Mon Sep 17 00:00:00 2001 From: daria Date: Wed, 2 Oct 2024 14:07:58 +0300 Subject: [PATCH 1/7] open contact page via keyboard navigation on contact request notification fix #1524 --- www/common/toolbar.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/www/common/toolbar.js b/www/common/toolbar.js index 2b0d2f648..b30b954b0 100644 --- a/www/common/toolbar.js +++ b/www/common/toolbar.js @@ -1198,7 +1198,13 @@ MessengerUI, Messages, Pages, PadTypes) { $('body').find('.cp-dropdown-content li').first().focus(); return $(el).find('.cp-notification-dismiss').click(); } - $(el).find('.cp-notification-content').click(); + if($(el).find('.cp-avatar')){ + $(el).find('.cp-avatar').click(); + } + else{ + $(el).find('.cp-notification-content').click(); + } + }); refresh(); }, From d47295f597331575a6bdc35ed9f9a2237d9daf23 Mon Sep 17 00:00:00 2001 From: daria Date: Wed, 2 Oct 2024 14:40:19 +0300 Subject: [PATCH 2/7] change hover style on contact request notifications fix #1525 --- customize.dist/src/less2/include/dropdown.less | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less index 4a5099ee3..003ed86fe 100644 --- a/customize.dist/src/less2/include/dropdown.less +++ b/customize.dist/src/less2/include/dropdown.less @@ -157,16 +157,28 @@ } } } + li[role="menuitem"] { border-radius: @variables_radius; white-space: nowrap; - &:hover { - background-color: @cp_dropdown-bg-hover !important; - } &:focus-visible { outline-color: @cp_dropdown-fg; } + .cp-avatar:hover { + background-color: @cp_dropdown-bg-hover !important; + } + .cp-notification-content:hover { + border-radius: @variables_radius; + background-color: @cp_dropdown-bg-hover !important; + } } + + li[role="menuitem"]:not(:has(.cp-avatar)) { + &:hover { + background-color: @cp_dropdown-bg-hover !important; + } + } + &> span { box-sizing: border-box; height: 26px; From a38964998ad37e065720585487593603696db26f Mon Sep 17 00:00:00 2001 From: daria Date: Wed, 16 Oct 2024 12:21:04 +0300 Subject: [PATCH 3/7] remove ``!important` from dropdown elements styling --- customize.dist/src/less2/include/dropdown.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less index 003ed86fe..baaed29a4 100644 --- a/customize.dist/src/less2/include/dropdown.less +++ b/customize.dist/src/less2/include/dropdown.less @@ -165,17 +165,17 @@ outline-color: @cp_dropdown-fg; } .cp-avatar:hover { - background-color: @cp_dropdown-bg-hover !important; + background-color: @cp_dropdown-bg-hover; } .cp-notification-content:hover { border-radius: @variables_radius; - background-color: @cp_dropdown-bg-hover !important; + background-color: @cp_dropdown-bg-hover; } } li[role="menuitem"]:not(:has(.cp-avatar)) { &:hover { - background-color: @cp_dropdown-bg-hover !important; + background-color: @cp_dropdown-bg-hover; } } From 8872927e210308e670ada369efe610102ecc6cad Mon Sep 17 00:00:00 2001 From: daria Date: Wed, 16 Oct 2024 13:29:34 +0300 Subject: [PATCH 4/7] notifications can be accessed via the keyboard #1524 --- www/common/toolbar.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/www/common/toolbar.js b/www/common/toolbar.js index b30b954b0..c01fa9f45 100644 --- a/www/common/toolbar.js +++ b/www/common/toolbar.js @@ -1198,12 +1198,9 @@ MessengerUI, Messages, Pages, PadTypes) { $('body').find('.cp-dropdown-content li').first().focus(); return $(el).find('.cp-notification-dismiss').click(); } - if($(el).find('.cp-avatar')){ - $(el).find('.cp-avatar').click(); - } - else{ + setTimeout(function () { $(el).find('.cp-notification-content').click(); - } + }, 0); }); refresh(); From 0072cb9324fd5bbd4bfaac48b549abe5b0d04bef Mon Sep 17 00:00:00 2001 From: daria Date: Wed, 13 Nov 2024 14:30:50 +0200 Subject: [PATCH 5/7] fix hover style for notifications #1525 remove `:has` selector --- customize.dist/src/less2/include/dropdown.less | 14 ++++++++------ www/common/sframe-common-mailbox.js | 4 +++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less index baaed29a4..ef9cd374c 100644 --- a/customize.dist/src/less2/include/dropdown.less +++ b/customize.dist/src/less2/include/dropdown.less @@ -164,6 +164,14 @@ &:focus-visible { outline-color: @cp_dropdown-fg; } + &:hover { + background-color: @cp_dropdown-bg-hover; + } + } + li[role="menuitem"].cp-notification-avatar { + &:hover { + background-color: transparent; + } .cp-avatar:hover { background-color: @cp_dropdown-bg-hover; } @@ -173,12 +181,6 @@ } } - li[role="menuitem"]:not(:has(.cp-avatar)) { - &:hover { - background-color: @cp_dropdown-bg-hover; - } - } - &> span { box-sizing: border-box; height: 26px; diff --git a/www/common/sframe-common-mailbox.js b/www/common/sframe-common-mailbox.js index 857b46bbe..bf05bdd18 100644 --- a/www/common/sframe-common-mailbox.js +++ b/www/common/sframe-common-mailbox.js @@ -105,7 +105,9 @@ define([ h('p', data.content.msg.type + ' - ' +formatData(data)) ]) ]); - + if ($(notif).find('.cp-avatar').length) { + $(notif).addClass('cp-notification-avatar'); + } if (typeof(data.content.getFormatText) === "function") { $(notif).find('.cp-notification-content p').html(data.content.getFormatText()); if (data.content.autorefresh) { From 59ce5936330c2168adbab6e871142a9e92e71683 Mon Sep 17 00:00:00 2001 From: daria Date: Wed, 4 Dec 2024 12:47:40 +0200 Subject: [PATCH 6/7] clean unnecessary changes --- customize.dist/src/less2/include/dropdown.less | 2 -- www/common/toolbar.js | 1 - 2 files changed, 3 deletions(-) diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less index ef9cd374c..00d1d35ed 100644 --- a/customize.dist/src/less2/include/dropdown.less +++ b/customize.dist/src/less2/include/dropdown.less @@ -157,7 +157,6 @@ } } } - li[role="menuitem"] { border-radius: @variables_radius; white-space: nowrap; @@ -180,7 +179,6 @@ background-color: @cp_dropdown-bg-hover; } } - &> span { box-sizing: border-box; height: 26px; diff --git a/www/common/toolbar.js b/www/common/toolbar.js index c01fa9f45..d86b2abb7 100644 --- a/www/common/toolbar.js +++ b/www/common/toolbar.js @@ -1201,7 +1201,6 @@ MessengerUI, Messages, Pages, PadTypes) { setTimeout(function () { $(el).find('.cp-notification-content').click(); }, 0); - }); refresh(); }, From 2a693e3a9086692f0e87a0ff036f99ff3cccbb93 Mon Sep 17 00:00:00 2001 From: daria Date: Tue, 10 Dec 2024 14:24:50 +0200 Subject: [PATCH 7/7] move notifications styles to the correct file(`notifications.less`) --- .../src/less2/include/dropdown.less | 12 ----------- .../src/less2/include/notifications.less | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/customize.dist/src/less2/include/dropdown.less b/customize.dist/src/less2/include/dropdown.less index 00d1d35ed..ee63ab5bc 100644 --- a/customize.dist/src/less2/include/dropdown.less +++ b/customize.dist/src/less2/include/dropdown.less @@ -167,18 +167,6 @@ background-color: @cp_dropdown-bg-hover; } } - li[role="menuitem"].cp-notification-avatar { - &:hover { - background-color: transparent; - } - .cp-avatar:hover { - background-color: @cp_dropdown-bg-hover; - } - .cp-notification-content:hover { - border-radius: @variables_radius; - background-color: @cp_dropdown-bg-hover; - } - } &> span { box-sizing: border-box; height: 26px; diff --git a/customize.dist/src/less2/include/notifications.less b/customize.dist/src/less2/include/notifications.less index 6a69b8beb..81e5fb5f8 100644 --- a/customize.dist/src/less2/include/notifications.less +++ b/customize.dist/src/less2/include/notifications.less @@ -97,6 +97,26 @@ margin: 0; } } + .cp-dropdown-container .cp-dropdown-content { + li[role="menuitem"]{ + .cp-notification-dismiss:hover { + border-radius: @variables_radius; + background-color: @cp_dropdown-bg-hover; + } + } + li[role="menuitem"].cp-notification-avatar { + &:hover { + background-color: transparent; + } + .cp-avatar:hover { + background-color: @cp_dropdown-bg-hover; + } + .cp-notification-content:hover { + border-radius: @variables_radius; + background-color: @cp_dropdown-bg-hover; + } + } + } }