Merge branch 'master' into feature/hubl-2

This commit is contained in:
Jean-Baptiste Pasquier 2020-11-30 19:17:22 +01:00
commit c3301e3c4e
No known key found for this signature in database
GPG Key ID: CC04B91B949C163A
5 changed files with 16 additions and 10 deletions

View File

@ -15,12 +15,12 @@
"project": "project",
"circle": "circle"
},
"dashboard": "Dahsboard",
"dashboard": "Dashboard",
"events": "Events",
"gov": "Governance",
"resources": "Resources",
"jobBoard": "Job offers",
"profileDirectory": "Members directory",
"profileDirectory": "Profiles directory",
"projects": "Projects",
"circles": "Circles",
"messages": "Messages",

View File

@ -1,5 +1,6 @@
document.addEventListener("DOMContentLoaded", () => {
const resizeChat = () => {
let isMobile = window.innerHeight < 993;
let chatBox = Array.from(document.querySelectorAll("solid-xmpp-chat"))
.map((el) => el.shadowRoot ? el.shadowRoot.getElementById("conversejs") : false)
.filter((el) => el)
@ -18,8 +19,10 @@ document.addEventListener("DOMContentLoaded", () => {
let viewportChat = Array.from(
document.querySelectorAll("#viewport .chat-view")
);
let headerOffset = document.querySelector('#header').offsetHeight;
let intermediateOffset = Array.from(document.querySelectorAll(".content-box__header")).filter(el=>el.offsetParent!==null?el:null)[0].offsetHeight;
viewportChat.forEach(
(c) => (c.style.height = "calc(100vh - 106px - 57px - 4px)")
(c) => (c.style.height = isMobile ? "calc(100vh - "+String(headerOffset+intermediateOffset)+"px - 57px)" : "calc(100vh - "+String(headerOffset+intermediateOffset)+"px)")
);
}
}
@ -33,7 +36,7 @@ document.addEventListener("DOMContentLoaded", () => {
clearInterval(isbody);
resizeChat();
}
}, 15);
}, 50);
window.addEventListener("load", () => {
setTimeout(() => {
@ -41,10 +44,12 @@ document.addEventListener("DOMContentLoaded", () => {
}, 0);
});
let windowResizing;
window.addEventListener("resize", () => {
setTimeout(() => {
windowResizing = setTimeout(() => {
clearInterval(windowResizing);
resizeChat();
}, 0);
}, 50);
});
document.addEventListener("navigate", () => {

View File

@ -10,8 +10,6 @@ document.addEventListener("DOMContentLoaded", function () {
document
.querySelector('.loggedIn')
.setAttribute("style", "display:none !important");
} else {
document.querySelector('sib-auth').login();
}
});
});

View File

@ -9,5 +9,8 @@
}
.avatar-text {
position: absolute;
top: 7.5rem;
@include breakpoint(lg) {
top: 2.8rem;
}
}

View File

@ -35,7 +35,7 @@ button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login(
button.notLoggedIn.mobile-menu-icon.icon-menu#toggleMainMenu
sib-auth(style='display:none!important')
sib-auth(style='display:none!important', auto-login)
sib-auth-provider(
data-authority=`${authority}`
data-id=`${authorityName || "authority"}`