Merge branch 'master' into feature/hubl-2
This commit is contained in:
commit
c3301e3c4e
@ -15,12 +15,12 @@
|
|||||||
"project": "project",
|
"project": "project",
|
||||||
"circle": "circle"
|
"circle": "circle"
|
||||||
},
|
},
|
||||||
"dashboard": "Dahsboard",
|
"dashboard": "Dashboard",
|
||||||
"events": "Events",
|
"events": "Events",
|
||||||
"gov": "Governance",
|
"gov": "Governance",
|
||||||
"resources": "Resources",
|
"resources": "Resources",
|
||||||
"jobBoard": "Job offers",
|
"jobBoard": "Job offers",
|
||||||
"profileDirectory": "Members directory",
|
"profileDirectory": "Profiles directory",
|
||||||
"projects": "Projects",
|
"projects": "Projects",
|
||||||
"circles": "Circles",
|
"circles": "Circles",
|
||||||
"messages": "Messages",
|
"messages": "Messages",
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
document.addEventListener("DOMContentLoaded", () => {
|
document.addEventListener("DOMContentLoaded", () => {
|
||||||
const resizeChat = () => {
|
const resizeChat = () => {
|
||||||
|
let isMobile = window.innerHeight < 993;
|
||||||
let chatBox = Array.from(document.querySelectorAll("solid-xmpp-chat"))
|
let chatBox = Array.from(document.querySelectorAll("solid-xmpp-chat"))
|
||||||
.map((el) => el.shadowRoot ? el.shadowRoot.getElementById("conversejs") : false)
|
.map((el) => el.shadowRoot ? el.shadowRoot.getElementById("conversejs") : false)
|
||||||
.filter((el) => el)
|
.filter((el) => el)
|
||||||
@ -18,8 +19,10 @@ document.addEventListener("DOMContentLoaded", () => {
|
|||||||
let viewportChat = Array.from(
|
let viewportChat = Array.from(
|
||||||
document.querySelectorAll("#viewport .chat-view")
|
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(
|
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);
|
clearInterval(isbody);
|
||||||
resizeChat();
|
resizeChat();
|
||||||
}
|
}
|
||||||
}, 15);
|
}, 50);
|
||||||
|
|
||||||
window.addEventListener("load", () => {
|
window.addEventListener("load", () => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
@ -41,10 +44,12 @@ document.addEventListener("DOMContentLoaded", () => {
|
|||||||
}, 0);
|
}, 0);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let windowResizing;
|
||||||
window.addEventListener("resize", () => {
|
window.addEventListener("resize", () => {
|
||||||
setTimeout(() => {
|
windowResizing = setTimeout(() => {
|
||||||
|
clearInterval(windowResizing);
|
||||||
resizeChat();
|
resizeChat();
|
||||||
}, 0);
|
}, 50);
|
||||||
});
|
});
|
||||||
|
|
||||||
document.addEventListener("navigate", () => {
|
document.addEventListener("navigate", () => {
|
||||||
|
@ -10,8 +10,6 @@ document.addEventListener("DOMContentLoaded", function () {
|
|||||||
document
|
document
|
||||||
.querySelector('.loggedIn')
|
.querySelector('.loggedIn')
|
||||||
.setAttribute("style", "display:none !important");
|
.setAttribute("style", "display:none !important");
|
||||||
} else {
|
|
||||||
document.querySelector('sib-auth').login();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
@ -9,5 +9,8 @@
|
|||||||
}
|
}
|
||||||
.avatar-text {
|
.avatar-text {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 2.8rem;
|
top: 7.5rem;
|
||||||
|
@include breakpoint(lg) {
|
||||||
|
top: 2.8rem;
|
||||||
|
}
|
||||||
}
|
}
|
@ -35,7 +35,7 @@ button.loggedIn(role='log in' onclick="document.querySelector('sib-auth').login(
|
|||||||
|
|
||||||
button.notLoggedIn.mobile-menu-icon.icon-menu#toggleMainMenu
|
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(
|
sib-auth-provider(
|
||||||
data-authority=`${authority}`
|
data-authority=`${authority}`
|
||||||
data-id=`${authorityName || "authority"}`
|
data-id=`${authorityName || "authority"}`
|
||||||
|
Loading…
Reference in New Issue
Block a user