Merge branch 'gm-members'

This commit is contained in:
Gaelle Morin 2018-12-19 20:16:30 +01:00
commit 0d922b0815
4 changed files with 70 additions and 30 deletions

View File

@ -4,8 +4,8 @@
"sdn": "https://test-paris.happy-dev.fr", "sdn": "https://test-paris.happy-dev.fr",
"cdn": "https://cdn.happy-dev.fr", "cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/", "xmpp": "https://jabber.happy-dev.fr/http-bind/",
"client_id": "833925"
//"client_id": "499509" //"client_id": "499509"
"client_id": "299390"
}, },
"prod": { "prod": {
"sdn": "https://test-paris.happy-dev.fr", "sdn": "https://test-paris.happy-dev.fr",

View File

@ -9,14 +9,15 @@ div.grid-layer
data-src=`${sdn}/members/`, data-src=`${sdn}/members/`,
data-fields='header, infos, groups, role, more', data-fields='header, infos, groups, role, more',
set-header='picture, user, pseudonym, bio, send', set-header='picture, user, pseudonym, bio, send',
set-infos='cell, user.roles, user.email, phone, skills', set-infos='cell, user.roles, user.email, phone, user.skills',
set-pseudonym='before-pseudo,pseudo', set-pseudonym='before-pseudo,pseudo',
value-before-pseudo='@', value-before-pseudo='@',
value-more='read more...', value-more='read more...',
template-more='hdapp-link-more',
value-send='SEND A MESSAGE', value-send='SEND A MESSAGE',
counter-template='${counter} members' template-more='hdapp-link-more',
template-send='chat-link', template-send='chat-link',
widget-skills='sib-display-lookuplist',
counter-template='${counter} members',
widget-picture='sib-display-img', widget-picture='sib-display-img',
widget-user='hdapp-userinfo', widget-user='hdapp-userinfo',
widget-roles='sib-display-lookuplist', widget-roles='sib-display-lookuplist',

View File

@ -32,7 +32,7 @@ h6 {
color: $color-black; color: $color-black;
font-weight: 600; font-weight: 600;
padding: 0; padding: 0;
margin: 0.67em 0; /*margin: 0.67em 0;*/
span { span {
font-weight: 400; font-weight: 400;

View File

@ -40,14 +40,15 @@
} }
> sib-display { > sib-display {
color: $color-grey2;
cursor: pointer; cursor: pointer;
background-color: white; background-color: white;
box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.14); box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.14);
display: flex; display: flex;
flex-flow: column wrap; flex-flow: column wrap;
padding: 1rem;
margin-bottom: 2.5rem; margin-bottom: 2.5rem;
@media(min-width: 56rem) { @media(min-width: 56rem) {
height: 70rem;
width: 30%; width: 30%;
} }
@ -57,57 +58,95 @@
div[name='header'] { div[name='header'] {
border-bottom: 1px solid $color-grey-light; border-bottom: 1px solid $color-grey-light;
padding-bottom: 1em; padding: 0.5em 0 3em;
padding: 0.5em;
margin-bottom: 1em;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
> * { > * {
display: flex; display: flex;
justify-content: center;
flex-basis: content; flex-basis: content;
justify-content: center;
} }
sib-display-img { sib-display-img {
flex-basis:150px; flex-basis:150px;
height: 300px;
margin: 1em auto;
width: 60%;
img { img {
border-radius: 100%; border-radius: 100%;
width:150px; width: 100%;
}
}
hdapp-userinfo {
@extend h1;
}
sib-display-div[name$='bio'] {
flex-basis: 5em;
margin-top: 1.5em;
}
[next=member-chat] {
align-self: center;
border: 1px solid $color-blue-light;
border-radius: 2em;
color: $color-blue-light;
font-size: 18px;
font-weight: bold;
padding: 0.6em 1.5em 0.4em;
@include icon('speech');
&::before {
font-size: 25px;
padding-right: 0.5em;
} }
} }
} }
div[name='infos'] {
//padding: 1.5em 1.2em 3em;
hdapp-userinfo { * {
@extend h1; margin-top: 1.5em;
}
[name=infos] { &::before {
margin: 2em 0; color: $color-yellow;
font-size: 20px;
> * { padding: 0 1em;
// display: block; }
margin: 0.5em 0;
} }
[name$='cell'] * {
@include icon('atom');
}
[name$='roles'] * {
@include icon('user');
}
[name$='email'] * {
@include icon('envelope');
}
[name$='phone'] * {
@include icon('phone');
}
} }
ul[name$='roles'] * {
@include icon('user');
}
ul[name$='cell'] * {
@include icon('location-pin');
}
[name$='user'] { [name$='user'] {
margin-bottom: 0em; margin-bottom: 0em;
} }
sib-display-div[name$='bio'] {
margin-top: 1em;
flex-basis : 5em;
}
a[href^='mailto'] { a[href^='mailto'] {
display: flex; display: flex;