Skip to content
Snippets Groups Projects
Commit f7fc5b1d authored by Marjolaine Le Bon's avatar Marjolaine Le Bon
Browse files

Merge branch 'feature/resource-component' of...

Merge branch 'feature/resource-component' of https://git.startinblox.com/applications/hubl into feature/resource-component
parents fc758cd0 55623c2d
No related branches found
No related tags found
1 merge request!172First integration to Hubl of the resource component
Pipeline #7113 failed
...@@ -3,4 +3,5 @@ ...@@ -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'
) )
\ No newline at end of file
...@@ -4,4 +4,5 @@ ...@@ -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'
) )
\ No newline at end of file
...@@ -90,7 +90,7 @@ ...@@ -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 @@ ...@@ -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;
......
...@@ -32,7 +32,7 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -78,7 +78,7 @@
} }
} }
} }
#resourcedetail { .resourcedetail {
[name="name"] { [name="name"] {
font-family: "RefrigeratorDelxW01Bold"; font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem; font-size: 3.2rem;
......
...@@ -6,4 +6,5 @@ ...@@ -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'
) )
\ No newline at end of file
...@@ -7,4 +7,5 @@ ...@@ -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'
) )
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment