From 6f65f54864ae804781983817b6bbcebe7a589915 Mon Sep 17 00:00:00 2001 From: Benoit Alessandroni Date: Thu, 26 Nov 2020 03:03:51 +0100 Subject: [PATCH 1/5] update: some easy css fixes --- src/locales/en.json | 2 +- src/styles/layout/events/events.scss | 14 +++++++------- src/styles/layout/polls/polls.scss | 2 +- src/styles/layout/resources/resources.scss | 11 +++++++---- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 2744724..16a6504 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -9,7 +9,7 @@ }, "menuLeft": { "emptyCircleProject": { - "notPartOf": "You're not part of", + "notPartOf": "You're not part of any", "createNew": "To create a new one, you can go in the", "adminPanel": "administration panel", "project": "project", diff --git a/src/styles/layout/events/events.scss b/src/styles/layout/events/events.scss index be0ef78..ecb3c0c 100644 --- a/src/styles/layout/events/events.scss +++ b/src/styles/layout/events/events.scss @@ -58,7 +58,7 @@ solid-event section { padding: 5px 20px; color: var(--color-primary); } - .headline h2 { + .headline h1 { float: left; margin-top: 35px; color: var(--color-primary); @@ -103,7 +103,7 @@ solid-event section { [name="infotext"] { text-align: left; } - [name="name"] { + .event-title[name="name"] { font-family: "RefrigeratorDelxW01Bold"; font-size: 3.2rem; line-height: 3.8rem; @@ -144,11 +144,11 @@ solid-event section { } .newevent input[type="submit"], .newtype input[type="submit"], - button { - width: max-content; - padding: 5px 20px; - background-color: #3C3F57; - } + // button { + // width: max-content; + // padding: 5px 20px; + // background-color: #3C3F57; + // } .newevent input[type="file"] { background-color: transparent; } diff --git a/src/styles/layout/polls/polls.scss b/src/styles/layout/polls/polls.scss index 348b545..9611081 100644 --- a/src/styles/layout/polls/polls.scss +++ b/src/styles/layout/polls/polls.scss @@ -11,7 +11,7 @@ solid-poll > div { #default-pollListing, #circles-pollListing { margin: auto; .headline { - h2 { + h1 { font-family: "RefrigeratorDelxW01Bold"; font-size: 2.4rem; color: var(--color-primary); diff --git a/src/styles/layout/resources/resources.scss b/src/styles/layout/resources/resources.scss index 652daab..066f410 100644 --- a/src/styles/layout/resources/resources.scss +++ b/src/styles/layout/resources/resources.scss @@ -5,7 +5,7 @@ font-weight: 400; color: var(--content-font-color); solid-resource { - solid-display div { + .listresources solid-display div { max-width: 1110px; solid-display { margin: 0 0 20px 40px; @@ -40,7 +40,7 @@ } } .listresources { - .headline h2 { + .headline h1 { float: left; margin-top: 5px; color: var(--color-primary); @@ -63,7 +63,7 @@ color: var(--color-primary); } solid-display solid-display { - [name="name"] { + .resource-title { font-family: "RefrigeratorDelxW01Bold"; color: var(--color-primary); } @@ -77,11 +77,14 @@ left: 0; } } + solid-multiple > solid-display > div > solid-display { + margin: 0; + } } } .resourcedetail { background-color: transparent; - [name="name"] { + .resource-title { font-family: "RefrigeratorDelxW01Bold"; font-size: 3.2rem; line-height: 3.8rem; From 1d074328886f5b717c4dae732b427adb4ac41cb5 Mon Sep 17 00:00:00 2001 From: Benoit Alessandroni Date: Thu, 26 Nov 2020 03:32:11 +0100 Subject: [PATCH 2/5] update: preserving title --- src/styles/layout/polls/polls.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/layout/polls/polls.scss b/src/styles/layout/polls/polls.scss index 9611081..06b2e58 100644 --- a/src/styles/layout/polls/polls.scss +++ b/src/styles/layout/polls/polls.scss @@ -14,6 +14,7 @@ solid-poll > div { h1 { font-family: "RefrigeratorDelxW01Bold"; font-size: 2.4rem; + text-transform: none; color: var(--color-primary); float: left; margin-top: 5px; From bdf66a67ca74d4851c5105e19a3b414b0d2b519f Mon Sep 17 00:00:00 2001 From: Benoit Alessandroni Date: Thu, 26 Nov 2020 03:33:11 +0100 Subject: [PATCH 3/5] update: preserving title --- src/styles/layout/polls/polls.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/layout/polls/polls.scss b/src/styles/layout/polls/polls.scss index 9611081..09f9a53 100644 --- a/src/styles/layout/polls/polls.scss +++ b/src/styles/layout/polls/polls.scss @@ -15,6 +15,7 @@ solid-poll > div { font-family: "RefrigeratorDelxW01Bold"; font-size: 2.4rem; color: var(--color-primary); + text-transform: none; float: left; margin-top: 5px; } From cdc09ad9a501b487dd317e7adb0aa30a385756d9 Mon Sep 17 00:00:00 2001 From: Benoit Alessandroni Date: Thu, 26 Nov 2020 18:18:00 +0100 Subject: [PATCH 4/5] update: update dependencies to use skypack and core 0.13 --- src/dependencies.pug | 24 ++++++++++++------------ src/page-polls.pug | 1 + src/page-resources.pug | 10 +++++----- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index d6cec94..4e06649 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -1,6 +1,5 @@ -script(src="https://browser.sentry-cdn.com/5.25.0/bundle.tracing.min.js" defer) - -script(type="module" src="/components/sentry.js" defer) +//- script(src="https://browser.sentry-cdn.com/5.25.0/bundle.tracing.min.js" defer) +//- script(type="module" src="/components/sentry.js" defer) script(type="module" src="/components/hubl-search-users.js" defer) script(type="module" src="/components/hubl-status.js" defer) script(type="module" src="/components/hubl-reactivity.js" defer) @@ -17,14 +16,16 @@ script(type="module" src="https://cdn.skypack.dev/@startinblox/router@0.11" defe script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.8" defer) //- script(type="module" src="/lib/sib-notifications/index.js" defer) -//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13 -//- if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)) -//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.2" defer) +if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.3" defer) //- script(type="module" src="/lib/sib-event-component/sib-event.js" defer) -//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13 -//- if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)) -//- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.0" defer) +if endpoints.polls || (endpoints.get && endpoints.get.polls) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.6" defer) + //- script(type="module" src="/lib/sib-conversation/sib-conversation.js" defer) + +if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.1" defer) //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) @@ -43,9 +44,8 @@ if endpoints.users || (endpoints.get && endpoints.get.users) script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@1.4" defer) //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer) -//- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13 -//- if endpoints.polls || (endpoints.get && endpoints.get.polls) - //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.0" defer) +if endpoints.polls || (endpoints.get && endpoints.get.polls) + script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.1" defer) //- script(type="module" src="/lib/sib-polls-component/index.js" defer) //- swal2 does not work with skypack diff --git a/src/page-polls.pug b/src/page-polls.pug index 5e14bde..3b5599e 100644 --- a/src/page-polls.pug +++ b/src/page-polls.pug @@ -3,4 +3,5 @@ data-src=`${endpoints.polls || (endpoints.get && endpoints.get.polls)}` range-base-polls=`${endpoints.pollRangeBase || (endpoints.get && endpoints.get.pollRangeBase)}` upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` + id-prefix='default' ) \ No newline at end of file diff --git a/src/page-resources.pug b/src/page-resources.pug index 235c99e..7ad5e1a 100644 --- a/src/page-resources.pug +++ b/src/page-resources.pug @@ -1,8 +1,8 @@ .views-container solid-resource(data-src=`${endpoints.resources || (endpoints.get && endpoints.get.resources)}` - range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}` - range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}` - range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}` - upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` - id-prefix='default' + range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}` + range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}` + range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}` + upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` + id-prefix='default' ) \ No newline at end of file From 1d1f8de324ed83791c793b687e84375a173cc3ed Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Thu, 3 Dec 2020 10:58:08 +0000 Subject: [PATCH 5/5] feature: activate sw --- src/scripts/register-sw.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/scripts/register-sw.js b/src/scripts/register-sw.js index c479a12..5b375a8 100644 --- a/src/scripts/register-sw.js +++ b/src/scripts/register-sw.js @@ -1,11 +1,11 @@ -// if('serviceWorker' in navigator) { - // var refreshing; - // navigator.serviceWorker.addEventListener('controllerchange', () => { - // if (refreshing) { - // return; - // } - // refreshing = true; - // window.location.reload(); - // }); - // navigator.serviceWorker.register('/sw.js'); -// } \ No newline at end of file +if('serviceWorker' in navigator) { + var refreshing; + navigator.serviceWorker.addEventListener('controllerchange', () => { + if (refreshing) { + return; + } + refreshing = true; + window.location.reload(); + }); + navigator.serviceWorker.register('/sw.js'); +} \ No newline at end of file