diff --git a/src/dependencies.pug b/src/dependencies.pug
index d6cec948d51fe0e838ad3aa370a20a35777cf651..4e066497c2f822fcf611540177fc457536e73cab 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/locales/en.json b/src/locales/en.json
index 7b06fc0a2b8febaaf14386045aef577ae0140651..f5e83fe7de54440e85c4e9645bcc4f357d617103 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/page-polls.pug b/src/page-polls.pug
index 5e14bde94f5c33a654497b4b05f5dd1849a114d7..3b5599ee43a1831e3ec6d1ae5560be020cefa871 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 235c99ec92c5af184335dd20aa196a4b787d9499..7ad5e1a4a3678d96e74f2cf1e3925bdff0adceef 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
diff --git a/src/scripts/register-sw.js b/src/scripts/register-sw.js
index c479a1258f4e905c7ccb537f5c88d09fce61c7a0..5b375a824fabba7c2a2d7a6104debc5293236939 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
diff --git a/src/styles/layout/events/events.scss b/src/styles/layout/events/events.scss
index be0ef785ce4eeda132b508a5fb630d6405e3b8d9..ecb3c0c743593804754f66db1cb8b7e9c336d199 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 4ef2db44d3ad2b57e248c0b16ee2f9c37e2628f4..b4a7870ff6d305d474866718ea393a5bc783c096 100644
--- a/src/styles/layout/polls/polls.scss
+++ b/src/styles/layout/polls/polls.scss
@@ -11,10 +11,12 @@ solid-poll > div {
#default-pollListing, #circles-pollListing {
margin: auto;
.headline {
- h2 {
+ h1 {
font-family: "RefrigeratorDelxW01Bold";
font-size: 2.4rem;
+ text-transform: none;
color: var(--color-primary);
+ text-transform: none;
float: left;
margin-top: 5px;
}
diff --git a/src/styles/layout/resources/resources.scss b/src/styles/layout/resources/resources.scss
index 652daabce49d08a36cffbfbb13ddde66d0147845..066f41090b347e9f38da8e2f6a1137b9a233353f 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;