Skip to content
Snippets Groups Projects
Commit 08690bb8 authored by Benoit Alessandroni's avatar Benoit Alessandroni
Browse files

Merge branch 'integration/dashboard-completion' into 'master'

Integration/dashboard completion

See merge request startinblox/applications/coop-starter/coopstarter-front!25
parents 2b554cba 6b3983b9
No related branches found
No related tags found
1 merge request!25Integration/dashboard completion
...@@ -3,7 +3,7 @@ include ../../components/widgets ...@@ -3,7 +3,7 @@ include ../../components/widgets
.block_log.block_creat_count .block_log.block_creat_count
sib-display( sib-display(
bind-resources, bind-resources,
fields='steps, format, content(name, preview_image, description, tags),\ fields='name, steps, format, content(preview_image, description, tags),\
submitter_info(submitter.name, \ submitter_info(submitter.name, \
submitter.mentor_profile.organisation.name, skills, uri, broken),\ submitter.mentor_profile.organisation.name, skills, uri, broken),\
review.reviewer.name, copyright, specifications(\ review.reviewer.name, copyright, specifications(\
......
...@@ -41,7 +41,7 @@ div.block_list ...@@ -41,7 +41,7 @@ div.block_list
) )
div(id='requests', class="tabcontent") div(id='requests', class="tabcontent")
sib-display( sib-display.request_accordeon(
data-src=`${endpoints.requests}` data-src=`${endpoints.requests}`
fields='content(name, description), field, language.name, target, create', fields='content(name, description), field, language.name, target, create',
...@@ -54,14 +54,14 @@ div.block_list ...@@ -54,14 +54,14 @@ div.block_list
sib-display#resources-history( sib-display#resources-history(
bind-user bind-user
nested-field='resources' nested-field='resources'
fields='content(name, format, publication_year), actions(review, edit, detail, delete)', fields='content(name, format, publication_year), actions(review, detail, edit, delete)',
widget-review='cs-resource-status',
widget-format='cs-display-multiple-property' widget-format='cs-display-multiple-property'
label-format='Formats: ' label-format='Formats: '
each-label-format='' each-label-format=''
multiple-format multiple-format
widget-review='cs-resource-status'
widget-publication_year='cs-display-resource-property' widget-publication_year='cs-display-resource-property'
label-publication_year='Date of publication:' label-publication_year='Date of publication:'
......
...@@ -218,7 +218,7 @@ body{ ...@@ -218,7 +218,7 @@ body{
margin: 0 auto; margin: 0 auto;
} }
.button_base, input[type="submit"]{ .button_base, input[type="submit"], #mentor-resource-detail a,.sib-conversation form input[type="submit"]{
transition: all .3s ease-in-out; transition: all .3s ease-in-out;
background-color: var(--bg-btn-base); background-color: var(--bg-btn-base);
color: var(--bg-block); color: var(--bg-block);
...@@ -231,8 +231,9 @@ body{ ...@@ -231,8 +231,9 @@ body{
box-shadow: none; box-shadow: none;
border-radius: 20px; border-radius: 20px;
width: auto; width: auto;
cursor: pointer;
} }
.button_base:hover,, input[type="submit"]:hover{ .button_base:hover, input[type="submit"]:hover, #mentor-resource-detail a:hover,.sib-conversation form input[type="submit"]:hover{
background-color: var(--bg-block); background-color: var(--bg-block);
color: var(--bg-btn-base); color: var(--bg-btn-base);
} }
...@@ -249,6 +250,7 @@ body{ ...@@ -249,6 +250,7 @@ body{
border: 2px solid #444C4D; border: 2px solid #444C4D;
box-shadow: none; box-shadow: none;
width: auto; width: auto;
cursor: pointer;
} }
.button_dark:hover{ .button_dark:hover{
background-color: var(--bg-block); background-color: var(--bg-block);
...@@ -279,6 +281,7 @@ p{ ...@@ -279,6 +281,7 @@ p{
font-family: 'var(--typo-btn)'; font-family: 'var(--typo-btn)';
transition: all .3s ease-in-out; transition: all .3s ease-in-out;
margin: 3rem; margin: 3rem;
cursor: pointer;
} }
.backlink:hover{ .backlink:hover{
...@@ -299,6 +302,7 @@ p{ ...@@ -299,6 +302,7 @@ p{
display: inline-block; display: inline-block;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
cursor: pointer;
} }
.add_browse:hover{ .add_browse:hover{
...@@ -317,6 +321,7 @@ p{ ...@@ -317,6 +321,7 @@ p{
font-size: 1.4rem; font-size: 1.4rem;
border:none; border:none;
position: relative; position: relative;
cursor: pointer;
} }
.btn_filtre:after{ .btn_filtre:after{
font-family: "Font Awesome 5 pro"; font-family: "Font Awesome 5 pro";
...@@ -333,7 +338,7 @@ p{ ...@@ -333,7 +338,7 @@ p{
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXX ICONES XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ /* XXXXXXXXXXXXXXXXXXXXXXXXXXXX ICONES XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
.ico_gauche{ .ico_gauche, #mentor-resource-detail a{
padding-left: 3.5rem; padding-left: 3.5rem;
position: relative; position: relative;
} }
...@@ -342,7 +347,7 @@ p{ ...@@ -342,7 +347,7 @@ p{
position: relative; position: relative;
} }
.ico_gauche:before,ico_droite:before{ .ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before{
font-family: "Font Awesome 5 pro"; font-family: "Font Awesome 5 pro";
font-weight: 900; font-weight: 900;
position : absolute; position : absolute;
...@@ -366,6 +371,9 @@ ico_droite:before{ ...@@ -366,6 +371,9 @@ ico_droite:before{
.ico_search:before{ .ico_search:before{
content: "\f002"; content: "\f002";
} }
#mentor-resource-detail a:before{ /* ico link to ressource dans détail ressources*/
content:"\f0c1";
}
/*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx FIN ICONE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ /*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx FIN ICONE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
...@@ -424,7 +432,7 @@ input, textarea, select, form .ss-main .ss-multi-selected{ ...@@ -424,7 +432,7 @@ input, textarea, select, form .ss-main .ss-multi-selected{
input:focus, textarea:focus{ input:focus, textarea:focus{
background: var(--bg-form-focus); background: var(--bg-form-focus);
} }
.title_form, cs-section_introduction h2{ .title_form, cs-section_introduction h2, div#mentor-resource-detail cs-display-property[name="name"] p{
font-family: 'var(--typo)'; font-family: 'var(--typo)';
font-size: 2.2rem; font-size: 2.2rem;
text-align: left; text-align: left;
...@@ -801,7 +809,100 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ ...@@ -801,7 +809,100 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{
/*XXXXXXXXXXXXXXXXXXXXX DETAIL RESSOURCES XXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ /*XXXXXXXXXXXXXXXXXXXXX DETAIL RESSOURCES XXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
cs-display-step-property[label="Step"] p{
font-weight: bold;
border-bottom: #5DC6F2 solid 3px;
width: auto;
float: left;
padding-bottom: .5rem;
}
cs-display-multiple-property[label="Format:"] p{
width: auto;
float: right;
padding-bottom: .5rem;
}
sib-multiple[name="format"] + *{
clear: both;
}
sib-set-default[name="submitter_info"]{
display: block;
cs-display-resource-property:first-child b{
display: block;
}
p{
font-size: 1.4rem;
margin-bottom: 1rem;
}
}
#mentor-resource-detail a{
text-decoration: none;
display: inline-block;
margin: 3rem 0;
}
sib-set-default[name="specifications"]> cs-display-resource-property{
display: block;
float: left;
width: 33%;
border: 1px solid var(--bg-page);
padding: 2rem 0;
background: var(--bg-form-focus);
margin-top: 1px;
p{
text-align: center;
margin:0;
font-size: 1.4rem;
}
}
.sib-conversation div.conversation-form{
border: none;
position: relative;
}
div.sib-conversation textarea{
border-radius: 0;
background: white;
height: 4.5rem;
padding: 1.5rem 1rem 1rem 3.2rem;
font-size: 1.6rem;
}
div.sib-conversation div.conversation-form:before{
content: "\f27a";
font-family: "Font Awesome 5 pro";
font-weight: 900;
position : absolute;
display: block;
width: 1.5rem;
height: 1.5rem;
top: 5.5rem;
left: 2rem;
color: var(--bg-btn-base);
}
.sib-conversation form{
overflow: hidden;
input[type="submit"]{
float: right;
}
}
div#requests.tabcontent sib-display.request_accordeon div div> sib-display-value{
font-family: 'var(--typo-btn)';
font-size: 1.2rem;
color: var(--clr-typo-base);
float: left;
}
div#requests.tabcontent sib-display.request_accordeon div div> sib-set-default >sib-display-value{
color: #444C4D;
}
cs-validate-action div{
clear: both;
text-align: right;
}
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXX PROFILE XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX PROFILE XXXXXXXXXXXXXXXXXXXXX
...@@ -864,6 +965,7 @@ cs-display-property[name="mentor_profile.country"] p{ ...@@ -864,6 +965,7 @@ cs-display-property[name="mentor_profile.country"] p{
clear: both; clear: both;
} }
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXX MEDIA QUERIES XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX MEDIA QUERIES XXXXXXXXXXXXXXXXXXXXX
......
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