From 3c93bc191b32aa7c60533b27db5db43097aa6754 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 14 Jun 2021 09:43:46 +0200 Subject: [PATCH 1/3] fix: left menu delete contact button visibility --- src/styles/left-nav/_index.scss | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index d4468cb..f2262ca 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -220,15 +220,15 @@ nav#main__menu { /* The little cross icon on contacts' name appears or disapear + hover + styles */ .sub-menu__contacts>div>solid-display { + height: 28px; + display: block; hubl-menu-contact-removed { display: none; + button { + visibility: hidden; + } } - } - - .sub-menu__contacts>div>solid-display { - height: 28px; - display: block; &:hover { @@ -257,7 +257,8 @@ nav#main__menu { padding-top: 5px; button { - + visibility: visible; + &::before { font-size: 18px; color: white; From 3127336a9f1539bc5b4c216a0d6ea983a18f13af Mon Sep 17 00:00:00 2001 From: Sylvain Lehmann Date: Tue, 1 Jun 2021 17:00:42 +0200 Subject: [PATCH 2/3] feature: add displayStartEndDates poll option --- README.md | 7 +++++++ src/dependencies.pug | 2 +- src/views/page-polls.pug | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b0c05a1..f042870 100644 --- a/README.md +++ b/README.md @@ -548,10 +548,17 @@ On `config.json`: "pollRangeTags": "http://server.url/tags/", "pollRangeCircles": "http://server.url/circles/", "uploads": "http://server.url/upload/" + }, + "parameters": { + "displayStartEndDates": false } } ``` +Where: + +* `parameters.displayStartEndDates` display or not the start and the end date of polls + ### Project Project are a private group chat including Customer and Business Provider management. diff --git a/src/dependencies.pug b/src/dependencies.pug index 1bd79fb..64f03fc 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -48,7 +48,7 @@ if componentSet.has("notification") //- script(type="module" src="/lib/sib-notifications/index.js" defer) if componentSet.has("polls") - script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@3.0" defer) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@3.1" defer) //- script(type="module" src="/lib/solid-poll/index.js" defer) if componentSet.has("profileDirectory") diff --git a/src/views/page-polls.pug b/src/views/page-polls.pug index 1a4ef23..f288a09 100644 --- a/src/views/page-polls.pug +++ b/src/views/page-polls.pug @@ -4,5 +4,6 @@ solid-poll( range-tags=component.endpoints.pollRangeTags range-circles=component.endpoints.pollRangeCircles upload-dir=component.endpoints.uploads + display-start-end-date=component.parameters.displayStartEndDates uniq=component.uniq ) From 2929a618555504da03070a4bfe45fd5ac6592f34 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 14 Jun 2021 13:02:51 +0000 Subject: [PATCH 3/3] fix: attributes --- src/views/page-polls.pug | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/page-polls.pug b/src/views/page-polls.pug index f288a09..89ec73d 100644 --- a/src/views/page-polls.pug +++ b/src/views/page-polls.pug @@ -1,9 +1,10 @@ -solid-poll( - data-src=component.endpoints.get - data-dest=component.endpoints.post - range-tags=component.endpoints.pollRangeTags - range-circles=component.endpoints.pollRangeCircles - upload-dir=component.endpoints.uploads - display-start-end-date=component.parameters.displayStartEndDates - uniq=component.uniq -) +solid-poll( + data-src=component.endpoints.get + data-dest=component.endpoints.post + range-tags=component.endpoints.pollRangeTags + range-circles=component.endpoints.pollRangeCircles + upload-dir=component.endpoints.uploads + uniq=component.uniq +)&attributes({ + "display-start-end-date": component.parameters ? component.parameters.displayStartEndDates : false +})