diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 052c92e..1d73003 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -566,6 +566,7 @@ .menu_buttons.left.open.filters{ max-height: 91vh; top: 0; + left: 0; } .block_w_paging.routes { width: 100%; diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 71970b2..e88d4b8 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -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{ diff --git a/static/css/styles.css b/static/css/styles.css index 091c36e..eb5ec91 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -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; } diff --git a/static/js/find_route.js b/static/js/find_route.js index 758076a..1d588ec 100644 --- a/static/js/find_route.js +++ b/static/js/find_route.js @@ -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() } \ No newline at end of file diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index c57b9ee..9bf98f5 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -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')) diff --git a/templates/blocks/profile/b_support_chat.html b/templates/blocks/profile/b_support_chat.html index b92136a..f1604cd 100644 --- a/templates/blocks/profile/b_support_chat.html +++ b/templates/blocks/profile/b_support_chat.html @@ -11,7 +11,7 @@ {# #} loader {% if user.is_staff %} -