autonomic-cooperative
/
hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/resource-component' of https://git.startinblox.com/applications/hubl into feature/resource-component

This commit is contained in:
Marjolaine Le Bon 2020-08-11 19:55:19 +02:00
parent 5785f4b640 907f516732
commit 1ae859e896
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/page-events.pug
View File

@ -1,5 +1,5 @@
.views-container
sib-event(data-src=`${endpoints.events || (endpoints.get && endpoints.get.events)}`
solid-event(data-src=`${endpoints.events || (endpoints.get && endpoints.get.events)}`
range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}`
range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`

2
src/page-resources.pug
View File

@ -1,5 +1,5 @@
.views-container
sib-resource(data-src=`${endpoints.resources || (endpoints.get && endpoints.get.resources)}`
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)}`

2
src/styles/layout/events/events.scss
View File

@ -3,7 +3,7 @@
font-family: "Facit";
font-weight: 400;
color: #7A7F85;
sib-event {
solid-event {
.red-button,
.event-type {
background-color: #C4262E;

2
src/styles/layout/resources/resources.scss
View File

@ -3,7 +3,7 @@
font-family: "Facit";
font-weight: 400;
color: #3A3A3A;
sib-resource {
solid-resource {
background-color: #F0F3F6;
.sib-resource {
font-family: "Facit";

2
src/views/circle/page-circle-events.pug
View File

@ -1,5 +1,5 @@
#circle-listevents
sib-event(
solid-event(
class='w700'
bind-resources
nested-field="events"

2
src/views/circle/page-circle-resources.pug
View File

@ -1,5 +1,5 @@
#circle-listresources
sib-resource(
solid-resource(
class='w700'
bind-resources
nested-field="resources"