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

Browse Source
This commit is contained in:
Marjolaine Le Bon 2020-08-31 10:04:58 +02:00
commit f7fc5b1dab
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/page-events.pug
View File

@ -3,4 +3,5 @@
range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}` range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}`
range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}` range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
id-prefix='default'
) )

1
src/page-resources.pug
View File

@ -4,4 +4,5 @@
range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}` range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}`
range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}` range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
id-prefix='default'
) )

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

@ -90,7 +90,7 @@
padding: 5px; padding: 5px;
} }
} }
#eventdetail { .eventdetail {
.mdi::before { .mdi::before {
margin: 0 5px 0 20px; margin: 0 5px 0 20px;
} }
@ -120,8 +120,8 @@
font-size: 1.6rem; font-size: 1.6rem;
} }
} }
#newevent input[type="submit"], .newevent input[type="submit"],
#newtype input[type="submit"], .newtype input[type="submit"],
button { button {
width: max-content; width: max-content;
padding: 5px 20px; padding: 5px 20px;

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

@ -32,7 +32,7 @@
z-index: 1; z-index: 1;
position: relative; position: relative;
} }
#listresources .lnk-newkeyword { .listresources .lnk-newkeyword {
top: 133px; top: 133px;
left: 220px; left: 220px;
.button.thin-button.mdi { .button.thin-button.mdi {
@ -55,7 +55,7 @@
} }
} }
} }
#listresources { .listresources {
.lnk-newkeyword .button { .lnk-newkeyword .button {
font-size: 1.2rem; font-size: 1.2rem;
width: max-content; width: max-content;
@ -78,7 +78,7 @@
} }
} }
} }
#resourcedetail { .resourcedetail {
[name="name"] { [name="name"] {
font-family: "RefrigeratorDelxW01Bold"; font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem; font-size: 3.2rem;

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

@ -6,4 +6,5 @@
range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}` range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}`
range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}` range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
id-prefix='circles'
) )

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

@ -7,4 +7,5 @@
range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}` range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}`
range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}` range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
id-prefix='circles'
) )