Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-11-18 13:43:59 +03:00
4 changed files with 47 additions and 5 deletions

View File

@@ -1095,7 +1095,8 @@
min-height: calc(100vh - 200px);
background: #FFFFFF;
box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
width: 26%;
/*!*width: 26%;*/
width: 100%;
float: left;
padding: 2%;
position: sticky;
@@ -2228,6 +2229,10 @@
/*display: none;*/
}
.menu_buttons.filters{
width: 320px;
}
/* for curtain right*/
.cut_width_f_curtain{
@@ -2241,6 +2246,17 @@
height: 695px;
}
.cut_width_f_curtain.left{
max-width: 1280px;
text-align: -webkit-right;
position: sticky;
margin: auto;
z-index: 998;
top: 61px;
float: left;
height: 695px;
}
.menu_buttons{
/*background: #FFFFFF;*/
/*height: 100vh;*/
@@ -2309,6 +2325,18 @@
}
.menu_buttons.left.open.filters{
width: 300px;
background: #FFFFFF;
border-radius: 10px;
max-height: 83vh;
left: 0;
padding: 10px;
transition: 200ms;
/* position: fixed; */
float: left;
}
.support .menu_buttons.left.open{
margin-top: 49px;
}
@@ -2473,7 +2501,7 @@
.img_one_news{
display: block;
aspect-ratio: 4/3;
/*height: 300px;*/
height: 225px;
object-fit: cover;
}

View File

@@ -10,7 +10,7 @@
{% if show_filter_and_results %}
<div class="block-find-route">
{% include "forms/f_find_route_filters_form.html" %}
{# {% include "forms/f_find_route_filters_form.html" %}#}
<div class="block_w_paging routes">

View File

@@ -1,6 +1,6 @@
{% load static %}
<div class="block-filters-find-route">
{#<div class="block-filters-find-route">#}
<div class="title_filters_find_route">Все фильтры</div>
<div class="methods_transportation_form_filters">
<div class="title_el_methods_transportation">Способ перевозки</div>
@@ -86,4 +86,4 @@
</select>
</div>
</div>
{#</div>#}

View File

@@ -70,6 +70,20 @@
</div>
</div>
</div>
{% if not page_type == 'profile' %}
<div class="cut_width_f_curtain left">
<div class="menu_buttons curtain left open filters" data-name="Меню">
{% include "forms/f_find_route_filters_form.html" %}
<div class="handler_menu close" onclick="open_curtain('left')">
<img class="btns_f_curtain close left" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
<div class="text_f_curtain left">Меню</div>
<img class="btns_f_curtain close right" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
<div class="clear_both"></div>
</div>
</div>
</div>
{% endif %}
<div class="wrapper_content">
{% block content %}