diff --git a/src/dependencies.pug b/src/dependencies.pug
index 62481a0c13e7e28b625edef8f634f8829375cd83..180fb79bccfc74e38b924e7ce67f0b4e372a8650 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -11,14 +11,12 @@ script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notific
//- script(type="module" src="/lib/sib-notifications/index.js" defer)
if endpoints.get
- //- DISABLED - please migrate to dev.skypack.dev + upgrade to core@0.13
- //- if endpoints.get.events && endpoints.get.typeevents
- //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-event@1.2" defer)
+ if endpoints.get.events && 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.get.resources && endpoints.get.resourceskeywords && endpoints.get.resourcestypes
- //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-resource@1.0" defer)
+ if endpoints.get.resources && endpoints.get.resourceskeywords && 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.get.joboffers
@@ -37,7 +35,6 @@ if endpoints.get
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-chat@1.7" 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.get.polls
- //- script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.0" defer)
+ if 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)
diff --git a/src/index.pug b/src/index.pug
index d266e89f2e80d25951eef65a326a631ae27c3d47..d276dc6dba9ef218c8c2125f17f26f35740fbe0e 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -104,15 +104,15 @@ html(lang="en")
include views/page-messages.pug
if endpoints.get.polls
- #polls(hidden, data-view="polls", no-render).with-sidebar
+ #polls(hidden, data-view="polls").with-sidebar
include views/page-polls.pug
if endpoints.get.events
- #events(hidden, data-view="events", no-render)
+ #events(hidden, data-view="events")
include views/page-events.pug
if endpoints.get.resources
- #resources(hidden, data-view="resources", no-render)
+ #resources(hidden, data-view="resources")
include views/page-resources.pug
#admin(hidden, data-view="admin", no-render).with-sidebar
diff --git a/src/locales/en.json b/src/locales/en.json
index a897e525aad0c93eb11d1bdaff3270e11e00acad..05e574645f4da8ab5e73dbfdf4603c286acceb0f 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 be0ef785ce4eeda132b508a5fb630d6405e3b8d9..4cbe6a6670f62444bad328ceb9cd3ceccf1c05a7 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;
@@ -143,8 +143,7 @@ solid-event section {
background-color: var(--form-inputs-background);
}
.newevent input[type="submit"],
- .newtype input[type="submit"],
- button {
+ .newtype input[type="submit"] {
width: max-content;
padding: 5px 20px;
background-color: #3C3F57;
diff --git a/src/styles/layout/polls/polls.scss b/src/styles/layout/polls/polls.scss
index 348b545dfb28fc649aad03d1cf9b3d6582cbd428..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;
}
@@ -72,14 +74,18 @@ solid-poll > div {
margin: auto;
> solid-display {
width: 320px;
- height: 550px;
+ height: 520px;
margin: 0 0 20px 40px;
+ [name="topline"] {
+ padding: 10px;
+ }
>div:first-of-type {
background-color: #fff;
height: 100%;
-webkit-box-shadow: 0px 0px 4px 1px #CACACA;
box-shadow: 0px 0px 4px 1px #CACACA;
*[name="body"] {
+ padding: 10px;
/*size of tags of poll card*/
poll-display-votetags {
>div {
@@ -105,6 +111,7 @@ solid-poll > div {
height: 30px;
width: 100%;
display: inline-block;
+ text-align: center;
}
[name="hostingOrganisation"],
[name="endDate"] {
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;
diff --git a/src/views/page-polls.pug b/src/views/page-polls.pug
index 5e14bde94f5c33a654497b4b05f5dd1849a114d7..3b5599ee43a1831e3ec6d1ae5560be020cefa871 100644
--- a/src/views/page-polls.pug
+++ b/src/views/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/views/page-resources.pug b/src/views/page-resources.pug
index 235c99ec92c5af184335dd20aa196a4b787d9499..7ad5e1a4a3678d96e74f2cf1e3925bdff0adceef 100644
--- a/src/views/page-resources.pug
+++ b/src/views/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