fix chat
This commit is contained in:
parent
ca4735d3bc
commit
ac9fba3c31
1
Makefile
1
Makefile
@ -68,5 +68,6 @@ pull:
|
|||||||
|
|
||||||
sync:
|
sync:
|
||||||
rsync -rv www/* staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ --exclude=www/oidc-client-config.json
|
rsync -rv www/* staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/ --exclude=www/oidc-client-config.json
|
||||||
|
rsync -v www/.htaccess staging-app@ssh-staging-app.happy-dev.fr:~/staging-app.happy-dev.fr/
|
||||||
|
|
||||||
.PHONY: default install submodules copy_lib copy_samples build watch serve clean sync buildprod pull deploy
|
.PHONY: default install submodules copy_lib copy_samples build watch serve clean sync buildprod pull deploy
|
@ -30,7 +30,7 @@ link(href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,6
|
|||||||
//- local
|
//- local
|
||||||
link(rel='import', href='/lib/sib-core/sib-display.html')
|
link(rel='import', href='/lib/sib-core/sib-display.html')
|
||||||
link(rel='import', href='/lib/sib-router/sib-router.html')
|
link(rel='import', href='/lib/sib-router/sib-router.html')
|
||||||
//- link(rel='import', href='/lib/sib-chat/sib-chat.html')
|
link(rel='import', href='/lib/sib-chat/sib-chat.html')
|
||||||
|
|
||||||
//- cdn
|
//- cdn
|
||||||
link(rel='import', href="https://cdn.happy-dev.fr/sib-core/sib-display.html")
|
link(rel='import', href="https://cdn.happy-dev.fr/sib-core/sib-display.html")
|
||||||
|
@ -8,10 +8,10 @@ sib-router#member-router(default-route='member-chat')
|
|||||||
div Éditer
|
div Éditer
|
||||||
#member-views-container
|
#member-views-container
|
||||||
sib-trigger(next="members" class="back") Back to directory
|
sib-trigger(next="members" class="back") Back to directory
|
||||||
.limiter
|
div
|
||||||
#member-chat
|
#member-chat
|
||||||
include page-member-chat.pug
|
include page-member-chat.pug
|
||||||
#member-profile
|
#member-profile.limiter
|
||||||
include page-member-profile.pug
|
include page-member-profile.pug
|
||||||
#member-edit
|
#member-edit
|
||||||
include page-member-edit.pug
|
include page-member-edit.pug
|
@ -65,7 +65,7 @@ div
|
|||||||
widget-cell='hdapp-usercell',
|
widget-cell='hdapp-usercell',
|
||||||
widget-roles='sib-display-lookuplist',
|
widget-roles='sib-display-lookuplist',
|
||||||
widget-skills='sib-display-lookuplist',
|
widget-skills='sib-display-lookuplist',
|
||||||
set-searchset='user.first_name, user.last_name',
|
set-searchset='pseudo',
|
||||||
search-fields='searchset',
|
search-fields='searchset',
|
||||||
next='member'
|
next='member'
|
||||||
)
|
)
|
||||||
|
@ -11,4 +11,16 @@ document.addEventListener('DOMContentLoaded', function(event) {
|
|||||||
window.addEventListener('click', e => {
|
window.addEventListener('click', e => {
|
||||||
navBar.classList.remove('open');
|
navBar.classList.remove('open');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function resize() {
|
||||||
|
setTimeout(()=>
|
||||||
|
Array.from(document.querySelectorAll('.chat-view')).forEach(elm => {
|
||||||
|
elm.style.setProperty('--pos-top', elm.offsetTop + 'px');
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
window.addEventListener('resize', resize);
|
||||||
|
window.addEventListener('navigate', resize);
|
||||||
|
document.addEventListener('load', resize);
|
||||||
|
document.addEventListener('WebComponentsReady', resize);
|
||||||
|
resize();
|
||||||
});
|
});
|
||||||
|
@ -52,9 +52,11 @@ sib-display-lookuplist[name='skills'] {
|
|||||||
|
|
||||||
.chat-view {
|
.chat-view {
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
border: 1px dashed green;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
min-height: 300px;
|
background-color: #fff;
|
||||||
|
@extend %shadow;
|
||||||
|
height: calc(100vh - 143px - 5em);
|
||||||
|
height: calc(100vh - var(--pos-top, 143px) - 5em);
|
||||||
> sib-chat {
|
> sib-chat {
|
||||||
@include pos();
|
@include pos();
|
||||||
}
|
}
|
||||||
|
@ -24,6 +24,7 @@ h5,
|
|||||||
h6 {
|
h6 {
|
||||||
color: $color-black;
|
color: $color-black;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
|
padding: 0;
|
||||||
margin: 0.67em 0;
|
margin: 0.67em 0;
|
||||||
span {
|
span {
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
@ -97,7 +98,6 @@ h3 {
|
|||||||
|
|
||||||
#subContainer {
|
#subContainer {
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: 100%;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#mainContainer {
|
#mainContainer {
|
||||||
|
@ -5,10 +5,8 @@
|
|||||||
background-color: $color-white;
|
background-color: $color-white;
|
||||||
color: $color-grey;
|
color: $color-grey;
|
||||||
max-width: 16rem;
|
max-width: 16rem;
|
||||||
position: sticky;
|
position: relative;
|
||||||
top: 0;
|
min-height: 100%;
|
||||||
height: 100%;
|
|
||||||
max-height: 100vh;
|
|
||||||
&.open {
|
&.open {
|
||||||
transform: translateX(0);
|
transform: translateX(0);
|
||||||
}
|
}
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit bed0a4d7b743d3e35ec016c880101e8496bc224f
|
Subproject commit 97e4d2773deb81d28ccbe6c65d82d316bb7ee022
|
@ -41,8 +41,8 @@
|
|||||||
<h1>Members</h1>
|
<h1>Members</h1>
|
||||||
<sib-display id="profiles-list"
|
<sib-display id="profiles-list"
|
||||||
data-src="https://test-paris.happy-dev.fr/members/"
|
data-src="https://test-paris.happy-dev.fr/members/"
|
||||||
data-fields="pseudo, user.member.user.member.user.member.bio, a.b"
|
data-fields="pseudo, user.member.user.member.user.member.bio, ab"
|
||||||
set-a.b="user.first_name, user.last_name"
|
set-ab="user.first_name, user.last_name"
|
||||||
></sib-display>
|
></sib-display>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div>
|
<!-- <div>
|
||||||
|
Loading…
Reference in New Issue
Block a user