From 39f37bcd2300fa4554e2e74a8b5c236f305ad4e1 Mon Sep 17 00:00:00 2001 From: SBD Date: Sun, 19 Nov 2023 19:46:30 +0300 Subject: [PATCH] 0.8.377 --- static/css/mobile_styles.css | 13 +++-- static/css/styles(boris).css | 18 ++++++- static/js/user_profile_2.js | 95 +++++++++++++++++++++--------------- templates/tb_base.html | 4 +- 4 files changed, 83 insertions(+), 47 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 3228a65..4924a92 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -598,6 +598,13 @@ border-radius: 10px; display: block; } + .menu_buttons.curtain.left.open.first.filters{ + left: -320px; + } + + .menu_buttons.curtain.left.open.filters{ + left: 0; + } .menu_buttons.left.open{ left: 0; @@ -688,9 +695,6 @@ top: 0; right: 0; } - .block_overlay.show.routes{ - display: block; - } #customer>a, #mover>a{ left: 5%; } @@ -1156,6 +1160,9 @@ .block_overlay.show{ display: block; } + .block_overlay.show.routes { + display: block; + } /*этот стиль перекрывал блок диалога в сообщения блюром*/ .menu_buttons.right.open { right: 0; diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index e88d4b8..bcf9340 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2290,7 +2290,7 @@ z-index: 998; top: 61px; float: right; - height: 695px; + /*height: 695px;*/ } .cut_width_f_curtain.left{ @@ -2301,7 +2301,7 @@ z-index: 998; top: 61px; float: left; - height: 695px; + /*height: 695px;*/ } .menu_buttons{ @@ -2430,6 +2430,11 @@ color: #000000; left: 272px; } +.menu_buttons.left.open.first.filters .handler_menu{ + background: #FF613A; + color: #FFFFFF; + left: -49px; +} .menu_buttons.right.open .handler_menu{ background: #FFFFFF; color: #000000; @@ -2491,6 +2496,15 @@ padding-left: 10px; } +.menu_buttons.left.open.first.filters .btns_f_curtain{ + transition: 200ms; + transform: rotate(270deg); + filter: brightness(0) saturate(100%) invert(100%) sepia(2%) saturate(0%) hue-rotate(162deg) brightness(104%) contrast(103%); + padding-left: 10px; + position: relative; + top: 10px; +} + .text_f_curtain{ display: inline-block; } diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 6a64d28..5171e19 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -729,7 +729,7 @@ function open_curtain (left=null,right=null,overlay=null,close=null){ } if (close){ // curtain = getOpenCurtain() - + turnOffFirst(curtain) let handler_text = curtain.querySelector('.text_f_curtain') handler_text.innerHTML = curtain_name @@ -747,56 +747,71 @@ function open_curtain (left=null,right=null,overlay=null,close=null){ } } else { - let user_type = getInfoAboutUser() - if (user_type === 'mobile' || !window.location.host.includes('profile') || user_type === 'laptop' ) { - curtain.classList.toggle("open") - curtain.classList.toggle("close") - newCurtainZIndex() - let curtain_check = getOpenCurtain() - if (curtain_check.length > 1){ - let curtain_old = getCurtainWIncreaceZindex(curtain_check,'decreace')['increace'] - curtain_old.classList.toggle("close") - curtain_old.classList.toggle("open") + if (curtain.classList.contains('first')){ + turnOffFirst(curtain) + let overlay = document.querySelector('.block_overlay.show') + if (!overlay){ + let overlay_clear = document.querySelector(".block_overlay") + overlay_clear.classList.toggle('show') + overlay_clear.classList.toggle('hidden') } - if (curtain_check.length > 0){ - let overlay = document.querySelector('.block_overlay.show') - if (!overlay){ - let overlay_clear = document.querySelector(".block_overlay") - overlay_clear.classList.toggle('show') - overlay_clear.classList.toggle('hidden') + } else { + let user_type = getInfoAboutUser() + if (user_type === 'mobile' || !window.location.host.includes('profile') || user_type === 'laptop' ) { + curtain.classList.toggle("open") + curtain.classList.toggle("close") + newCurtainZIndex() + let curtain_check = getOpenCurtain() + if (curtain_check.length > 1){ + let curtain_old = getCurtainWIncreaceZindex(curtain_check,'decreace')['increace'] + curtain_old.classList.toggle("close") + curtain_old.classList.toggle("open") + } + if (curtain_check.length > 0){ + let overlay = document.querySelector('.block_overlay.show') + if (!overlay){ + let overlay_clear = document.querySelector(".block_overlay") + overlay_clear.classList.toggle('show') + overlay_clear.classList.toggle('hidden') + } + } else { + + closeOverlay() + } } else { - - closeOverlay() - + if (!window.location.href.includes('profile')){ + // + } } - } else { - if (!window.location.href.includes('profile')){ - // + + + let handler_text = curtain.querySelector('.text_f_curtain') + if (curtain.classList.contains('open')){ + handler_text.innerHTML = 'Закрыть' + handler_text.style.fontSize = '13px' + } else { + handler_text.innerHTML = curtain_name + handler_text.style.fontSize = '13px' + } + + if (!curtain.classList.contains('open')){ + body.style.overflowY = '' + } else { + body.style.overflowY = 'hidden' } } - - - let handler_text = curtain.querySelector('.text_f_curtain') - if (curtain.classList.contains('open')){ - handler_text.innerHTML = 'Закрыть' - handler_text.style.fontSize = '13px' - } else { - handler_text.innerHTML = curtain_name - handler_text.style.fontSize = '13px' - } - - if (!curtain.classList.contains('open')){ - body.style.overflowY = '' - } else { - body.style.overflowY = 'hidden' - } - } } +function turnOffFirst (el) { + if (el.classList.contains('first')){ + el.classList.remove('first') + } +} + function closeOverlay () { let curt = getOpenCurtain() if (curt.length > 1){ diff --git a/templates/tb_base.html b/templates/tb_base.html index 3e03f11..0b07793 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -53,7 +53,7 @@ {% endblock %} -
+
{% include 'blocks/b_header.html' %} @@ -72,7 +72,7 @@
{% if page_type == 'routes' %}
-
+
{% include "forms/f_find_route_filters_form.html" %}