Merge remote-tracking branch 'origin/main'

This commit is contained in:
SDE
2024-01-31 16:39:12 +03:00
5 changed files with 22 additions and 9 deletions

View File

@@ -969,10 +969,10 @@
.left-part-block-enter-message{ .left-part-block-enter-message{
width: 70%; width: calc(70% - 74px);
} }
.right-part-block-enter-message{ .right-part-block-enter-message{
width: 30%; width: 74px;
} }
.container-message_support_chat{ .container-message_support_chat{
width: 70%; width: 70%;

View File

@@ -575,12 +575,12 @@
} }
.left-part-block-enter-message{ .left-part-block-enter-message{
width: 80%; width: calc(80% - 74px);
float: left; float: left;
} }
.right-part-block-enter-message{ .right-part-block-enter-message{
width: 20%; width: 74px;
float: right; float: right;
padding-top: 11px; padding-top: 11px;
text-align: right; text-align: right;

View File

@@ -136,8 +136,15 @@ legend {
} }
html, body{ html, body{
height: 100%; /*height: 100%;*/
scroll-behavior: smooth; scroll-behavior: smooth;
/*boris changed height*/
height: 100vh;
height: -webkit-fill-available;
height: fill-available;
max-height: fill-available;
max-height: -webkit-fill-available;
/* end*/
} }
.wrapper_content { .wrapper_content {

View File

@@ -11,9 +11,14 @@ window.onload = function (){
middleWareJS() middleWareJS()
openOrCloseCurtainSupportChat() openOrCloseCurtainSupportChat()
openOverlayOrClose() openOverlayOrClose()
let height = window.innerHeight // let body = document.querySelector("body")
document.querySelector('body').style.maxHeight = height + 'px' // const viewPortH = body.getBoundingClientRect().height;
document.querySelector('body').style.height = height + 'px' // const windowH = window.innerHeight;
// const browserUiBarsH = viewPortH - windowH;
// body.style.height = `calc(100vh - ${browserUiBarsH}px)`;
// let height = window.innerHeight
// document.querySelector('body').style.maxHeight = height + 'px'
// document.querySelector('body').style.height = height + 'px'
if (window.location.href.includes('profile') && !window.location.href.includes('login') && !window.location.href.includes('registration')){ if (window.location.href.includes('profile') && !window.location.href.includes('login') && !window.location.href.includes('registration')){
let user_type = getInfoAboutUser() let user_type = getInfoAboutUser()
if (user_type === 'mobile') { if (user_type === 'mobile') {
@@ -39,6 +44,7 @@ window.onload = function (){
} }
// //
function middleWareJS(){ function middleWareJS(){
let footer = document.querySelector("footer") let footer = document.querySelector("footer")
let body = document.querySelector("body") let body = document.querySelector("body")

View File

@@ -6,7 +6,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
{# <meta name="viewport" content="width=100%,maximum-scale=5,minimum-scale=1,initial-scale=1">#} {# <meta name="viewport" content="width=100%,maximum-scale=5,minimum-scale=1,initial-scale=1">#}
<meta name="viewport" content="width=device-width,maximum-scale=1,minimum-scale=1,initial-scale=1"> <meta name="viewport" content="width=device-width,maximum-scale=1,minimum-scale=1,initial-scale=1,height=device-height">
<meta name="vapid-key" content="{{ vapid_key }}"> <meta name="vapid-key" content="{{ vapid_key }}">