From e205176f602d32c824940c61be23cc8b0c193ee4 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 2 Apr 2021 11:10:11 +0200 Subject: [PATCH 1/6] fix: boldy # on unread --- src/views/partials/widgets/hubl-menu-publicprivate.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partials/widgets/hubl-menu-publicprivate.pug b/src/views/partials/widgets/hubl-menu-publicprivate.pug index 986cbdc..1365c1e 100644 --- a/src/views/partials/widgets/hubl-menu-publicprivate.pug +++ b/src/views/partials/widgets/hubl-menu-publicprivate.pug @@ -2,5 +2,5 @@ if componentSet.has('circles') || componentSet.has('projects') solid-widget(name='hubl-menu-publicprivate') template div( - class="${value == 'Public' ? 'text-simple-line-icons text-large': 'text-simple-line-icons text-xsmall'}" + class="${value == 'Public' ? 'text-large': 'text-simple-line-icons text-xsmall'}" ) ${value == 'Public' ? '#' : ''} \ No newline at end of file From 74021f4a7bac9aa4125a72217538a73c9b0affb9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 2 Apr 2021 11:23:35 +0200 Subject: [PATCH 2/6] fix: menu weight # --- src/views/partials/widgets/hubl-menu-publicprivate.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partials/widgets/hubl-menu-publicprivate.pug b/src/views/partials/widgets/hubl-menu-publicprivate.pug index 1365c1e..b4a06ce 100644 --- a/src/views/partials/widgets/hubl-menu-publicprivate.pug +++ b/src/views/partials/widgets/hubl-menu-publicprivate.pug @@ -2,5 +2,5 @@ if componentSet.has('circles') || componentSet.has('projects') solid-widget(name='hubl-menu-publicprivate') template div( - class="${value == 'Public' ? 'text-large': 'text-simple-line-icons text-xsmall'}" + class="${value == 'Public' ? 'text-bold text-large': 'text-simple-line-icons text-xsmall'}" ) ${value == 'Public' ? '#' : ''} \ No newline at end of file From e2656cc6616ab25dde4a468e3c341eeb26fc9030 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 2 Apr 2021 11:34:34 +0200 Subject: [PATCH 3/6] fix: bold on unread --- src/styles/left-nav/_index.scss | 3 +++ src/views/partials/widgets/hubl-menu-publicprivate.pug | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index e180005..85fa7f6 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -7,6 +7,9 @@ nav#main__menu { .unread { font-weight: bolder; + .bold-on-unread { + font-weight: bolder!important; + } } solid-route.menu, diff --git a/src/views/partials/widgets/hubl-menu-publicprivate.pug b/src/views/partials/widgets/hubl-menu-publicprivate.pug index b4a06ce..bd41855 100644 --- a/src/views/partials/widgets/hubl-menu-publicprivate.pug +++ b/src/views/partials/widgets/hubl-menu-publicprivate.pug @@ -2,5 +2,5 @@ if componentSet.has('circles') || componentSet.has('projects') solid-widget(name='hubl-menu-publicprivate') template div( - class="${value == 'Public' ? 'text-bold text-large': 'text-simple-line-icons text-xsmall'}" + class="${value == 'Public' ? 'bold-on-unread text-large': 'text-simple-line-icons text-xsmall'}" ) ${value == 'Public' ? '#' : ''} \ No newline at end of file From 4d88f3d2e69bed97e0536f865e4ba69921689d83 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 2 Apr 2021 11:38:46 +0200 Subject: [PATCH 4/6] fix: unread level --- src/scripts/unreads-menu.js | 2 +- src/views/partials/widgets/hubl-menu-publicprivate.pug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/unreads-menu.js b/src/scripts/unreads-menu.js index e35c7e9..a656061 100644 --- a/src/scripts/unreads-menu.js +++ b/src/scripts/unreads-menu.js @@ -10,7 +10,7 @@ document.addEventListener("DOMContentLoaded", function () { if (event.detail && event.detail.resource && event.detail.resource['@id']) { const badge = document.querySelector(`solid-badge[data-src="${event.detail.resource['@id']}"]`); if (badge) { - badge.parentElement.parentElement.classList.remove('unread'); + badge.parentElement.parentElement.parentElement.classList.remove('unread'); const project = badge.parentElement.parentElement.querySelector('.unread'); if (project) project.classList.remove('unread'); } diff --git a/src/views/partials/widgets/hubl-menu-publicprivate.pug b/src/views/partials/widgets/hubl-menu-publicprivate.pug index bd41855..1365c1e 100644 --- a/src/views/partials/widgets/hubl-menu-publicprivate.pug +++ b/src/views/partials/widgets/hubl-menu-publicprivate.pug @@ -2,5 +2,5 @@ if componentSet.has('circles') || componentSet.has('projects') solid-widget(name='hubl-menu-publicprivate') template div( - class="${value == 'Public' ? 'bold-on-unread text-large': 'text-simple-line-icons text-xsmall'}" + class="${value == 'Public' ? 'text-large': 'text-simple-line-icons text-xsmall'}" ) ${value == 'Public' ? '#' : ''} \ No newline at end of file From 6cc5ed144a82c96056e7f30c184ff6025d2ae78e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 2 Apr 2021 11:39:00 +0200 Subject: [PATCH 5/6] fix: removed unused styles --- src/styles/left-nav/_index.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index 85fa7f6..e180005 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -7,9 +7,6 @@ nav#main__menu { .unread { font-weight: bolder; - .bold-on-unread { - font-weight: bolder!important; - } } solid-route.menu, From 9f0f41dd00c936badb63803191f534e1d08db57a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Fri, 2 Apr 2021 11:44:46 +0200 Subject: [PATCH 6/6] fix: path fixing --- src/scripts/unreads-menu.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/unreads-menu.js b/src/scripts/unreads-menu.js index a656061..322b807 100644 --- a/src/scripts/unreads-menu.js +++ b/src/scripts/unreads-menu.js @@ -2,7 +2,7 @@ document.addEventListener("DOMContentLoaded", function () { window.addEventListener('newMessage', event => { let jid = event.detail.jid; Array.from(document.querySelectorAll('[data-jabberID="' + jid + '"]')).forEach(el => { - el.parentElement.parentElement.classList.add('unread'); + el.parentElement.parentElement.parentElement.classList.add('unread'); }); }); @@ -11,7 +11,7 @@ document.addEventListener("DOMContentLoaded", function () { const badge = document.querySelector(`solid-badge[data-src="${event.detail.resource['@id']}"]`); if (badge) { badge.parentElement.parentElement.parentElement.classList.remove('unread'); - const project = badge.parentElement.parentElement.querySelector('.unread'); + const project = badge.parentElement.parentElement.parentElement.querySelector('.unread'); if (project) project.classList.remove('unread'); }