Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-11-19 16:44:32 +03:00
11 changed files with 110 additions and 93 deletions

View File

@@ -566,6 +566,7 @@
.menu_buttons.left.open.filters{
max-height: 91vh;
top: 0;
left: 0;
}
.block_w_paging.routes {
width: 100%;

View File

@@ -423,12 +423,15 @@
.container-messenger{
width: 100%;
height: 100%;
margin-bottom: 30px;
}
.container-messenger.margin{
margin-top: 25px
}
.block-chat{
width: 66%;
height: 88vh;
height: calc(100vh - 120px);
border-radius: 10px;
border: 1px solid #E6E6E6;
background: #ffffff;
@@ -438,7 +441,7 @@
}
.block-chat.support{
height: 86vh;
height: calc(100vh - 154px);
}
.block-list-of-users{
@@ -1020,10 +1023,14 @@
.container_inp_w_abr{
height: 66%;
width: 98%;
width: 100%;
position: relative;
}
.block-find-route{
min-height: 695px;
}
.cont-el-form-search-carrier > button{
width: 99%;
border-radius: 10px;
@@ -1102,6 +1109,7 @@
border-right: 1px solid #E6E6E6;
border-bottom: 1px solid #E6E6E6;
border-left: 0;
cursor: text;
}
.abbreviation_airport_in_search.hide{
@@ -1145,7 +1153,7 @@
overflow-y: auto;
}
.block_w_paging.routes{
width: 73%;
width: 71%;
float: right;
}
@@ -2365,6 +2373,7 @@
padding-top: 8px;
}
.menu_buttons.left.open{
left: 0;
transition: 200ms;
@@ -2374,16 +2383,28 @@
width: 33%;
background: #FFFFFF;
border-radius: 10px;
max-height: 83vh;
max-height: calc(100vh - 125px);
}
.support .menu_buttons.left.open{
max-height: calc(100vh - 140px);
}
.support .menu_buttons.left.open.margin{
margin-top: 49px;
max-height: calc(100vh - 215px);
}
.menu_buttons.left.open.filters{
width: 294px;
background: #FFFFFF;
border-radius: 10px;
max-height: 83vh;
left: 0;
left: 19px;
padding: 13px;
/* position: fixed; */
float: left;
@@ -2393,9 +2414,6 @@
transition: 0ms;
}
.support .menu_buttons.left.open{
margin-top: 49px;
}
.handler_menu.left.close{
background: #FF613A;
@@ -2485,7 +2503,6 @@
height: calc(100vh - 120px);
max-height: 667px;
background: #F8F8F8;
direction: rtl;
}
.menu_profile.background{

View File

@@ -1147,6 +1147,17 @@ h2.title_new_route{
padding: 10px;
text-align: center;
position: relative;
height: 15px;
}
.menu_profile>div:first-of-type {
border-radius: 10px;
background:none;
/* Shadow 1 */
box-shadow: none;
margin-bottom: 10px;
padding: 10px;
text-align: center;
position: relative;
height: 40px;
}

View File

@@ -64,4 +64,10 @@ function changeWidthEL (el){
el.classList.add('w_100')
}
}
function focusOnInput (el) {
let parent = el.offsetParent
let input = parent.querySelector('.find_route')
input.focus()
}

View File

@@ -53,8 +53,12 @@ function select_tab_profile (el,url,owner_type=null) {
}
document.querySelector("#ru_lang").href = confirm_url_f_lang_ru
document.querySelector("#en_lang").href = confirm_url_f_lang_en
let header = document.querySelector("header")
header.scrollIntoView({
behavior: "smooth",
block: "end",
inline: "nearest"
})
middleWareJS()
let user_type = getInfoAboutUser()
if (user_type === 'mobile') {
@@ -430,7 +434,7 @@ function createTicket (el) {
}
function selectedUserMessenger (ticket_id=null,user_id=null){
function selectedUserMessenger (ticket_id=null,user_id=null,el){
let loader = document.querySelector(".loader_chat_f_sw_chats")
let block_chat = document.querySelector(".block-chat")
if (loader){
@@ -471,6 +475,12 @@ function selectedUserMessenger (ticket_id=null,user_id=null){
document.querySelector(".info_profile").innerHTML = data.html;
document.querySelector(".enter-message-inp").focus()
document.querySelector(".tab_user_messanger.select").scrollIntoView({behavior: "smooth",block:'nearest',inline:'nearest'});
let menu = document.querySelector(".menu_buttons.curtain.left")
let container_user_messenger = document.querySelector(".container-messenger")
if (!container_user_messenger.classList.contains('margin') || !menu.classList.contains('margin')){
container_user_messenger.classList.add('margin')
menu.classList.add('margin')
}
let user_type = getInfoAboutUser()
let curt_f_close = getCurtainWIncreaceZindex(document.querySelectorAll('.curtain'))