From 298e3861cff2d3afae779c843b44817df2fcd60a Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 16 Nov 2023 16:50:15 +0300 Subject: [PATCH 01/14] 0.0.225 upd mobile_styles.css --- static/css/mobile_styles.css | 145 +++++++++++++++++++++++++++-------- static/css/styles.css | 12 ++- 2 files changed, 120 insertions(+), 37 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index cc77058..6924cb7 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -4,7 +4,15 @@ @media (max-width: 1199px){ .benefit_img_about_service>figure>img{ width: 173px; - } + } + + .type_of_subscribes{ + align-items: center; + } + .container_subscribe{ + margin: 20px 16px; + width: 42%; + } } @media (max-width: 1064px){ .header_logo, .header_btn_mover, .header_btn_sender{ @@ -118,6 +126,10 @@ width: 100%; } + .subscribe_inf_right_part{ + width: 38%; + } + .button_profile_header{ display: none; } @@ -183,6 +195,10 @@ line-height: 42px; } + .subscribe_inf_left_part{ + width: 50%; + } + details{ width: 100%; @@ -409,19 +425,14 @@ width: 32%; } - .type_of_subscribes{ - flex-direction: column; - align-items: center; - } + .subscribes_container{ width: 100%; } - .container_subscribe{ - margin: 20px 16px; - width: unset; - } + + .first-decr-subscribe{ width: 55%; @@ -763,9 +774,12 @@ .left-part-carrier-card, .inf_carrier_container{ width: unset; float: none; - + } + .inf_carrier_container{ + padding-top: 70px; } + .carrier-card>.clear_both{ clear: unset; } @@ -846,6 +860,13 @@ font-size: 12px; } + + /*.phones_carrier{*/ + /* display: inline-block;*/ + /*}*/ + /*.phones_carrier>.inf_carrier_icon{*/ + /* width: 100%;*/ + /*}*/ /* END my_routes*/ /* support*/ @@ -872,8 +893,8 @@ /* subscribe*/ .b_another_subscribes{ - max-width: 272px; - margin: auto; + width: 100%; + } .state_subscribe, .state_subscribe > a{ font-size: 14px; @@ -882,17 +903,10 @@ line-height: 20px; } - .subscribe_inf{ - max-width: 260px; - margin: auto; - } - .subscribe_inf_left_part{ - width: 100%; - float: none; - margin: 10px auto; - } + + .label_toggle_switch_cont{ width: 92%; } @@ -923,10 +937,7 @@ line-height: 20px; } - .subscribe_inf_right_part{ - width: 100%; - float: none; - } + .title_options{ font-size: 18px; @@ -940,11 +951,11 @@ font-weight: 400; line-height: 20px; margin: 20px auto; - width: 262px; + width: 100%; } .another_subscribe{ - width: 102%; + width: 100%; height: unset; flex-direction: column; margin: 20px auto; @@ -989,7 +1000,7 @@ margin: 2.5% 0.5% 0.5% 0.5%; } .wrapper_switch_cont{ - max-width: 245px; + width: 100%; } #customer>.text_btn_profile{ @@ -1009,6 +1020,34 @@ /* */ +} +@media (max-width: 847px){ + .container_subscribe{ + margin: 20px 16px; + width: unset; + } + .type_of_subscribes{ + flex-direction: column; + align-items: center; + } + + .input_toggle_switch_display{ + width: 26px; + } + .label_toggle_switch_cont{ + width: 88%; + } + + .toggle_switch_cont{ + margin-top: 6px; + width: 12%; + } + .carrier_inf_moving.left{ + width: 46%; + } + .carrier_inf_moving.right{ + width: 37%; + } } @media (max-width: 828px){ .to_address_point_txt.find_route { @@ -1017,6 +1056,7 @@ .from_address_point_txt.find_route.first { width: 54.1%; } + } @media (max-width: 776px){ @@ -1033,6 +1073,8 @@ } + + } @media (max-width: 699px){ .block_overlay.show{ @@ -1074,6 +1116,12 @@ .info_profile{ width: 100%; } + + .another_subscribe{ + padding: 10px 10px 0 10px; + flex-direction: unset; + justify-content: space-evenly; + } } @media (max-width: 687px){ .to_address_point_txt.find_route { @@ -1082,8 +1130,29 @@ .from_address_point_txt.find_route.first { width: 52.1%; } + + .subscribe_inf{ + width: 95%; + } + .subscribe_inf_right_part{ + width: 100%; + float: none; + } + .subscribe_inf_left_part{ + width: 100%; + float: none; + margin: 10px auto; + } + + .wrapper_switch_cont>.width-100{ + display: inline-block; + } + + + + } -@media (max-width: 575px){ +@media (max-width: 575px) { #how_it_work_b{ width: 100%; @@ -1124,19 +1193,29 @@ .from_address_point_txt.find_route.first { width: 51.1%; } -} -@media (max-width: 440px){ - .container_inp_w_abr{ - width: 99%; + .another_subscribe{ + padding: unset; + flex-direction: column; + justify-content: unset; } +} +@media (max-width: 466px) { .to_address_point_txt.find_route { width: 48.4%; } + .from_address_point_txt.find_route.first { width: 47.95%; } + + + .container_inp_w_abr { + width: 99%; + } + } + @media (max-width: 440px){ .benefit_img_about_service { flex-direction: column; diff --git a/static/css/styles.css b/static/css/styles.css index 8649b5f..c1c6187 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1825,7 +1825,7 @@ input#id_extra_phone button#edit_route { display: block; height: 44px; - width: 98%; + width: 100%; background: #FF613A; color: #FFF; font-family: Inter; @@ -1840,7 +1840,9 @@ button#edit_route { } .button_remove_route { - display: inline-block; + display: inline-block; + width: 100%; + text-align: center; } @@ -1849,7 +1851,7 @@ button#remove_route { width: 285px; } button.confirm_remove{ - width: 49% !important; + width: 49.5%; border: 1px solid #ff0000a8; border-radius: 10px; color: #ff0000a8; @@ -1858,10 +1860,11 @@ button.confirm_remove{ margin-right: 3px; /*padding: 5px 0px 5px 0px;*/ font-size: 16px; + height: 44px; } button.cancel_remove{ - width: 48%; + width: 49.5%; border: 1px solid #808080cc; border-radius: 10px; color: #808080cc; @@ -1869,6 +1872,7 @@ button.cancel_remove{ font-weight: 600; /*padding: 5px 0px 5px 0px;*/ font-size: 16px; + height: 44px; } From ea940315450d39109f0fa771792dc280350483bf Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 16 Nov 2023 17:26:16 +0300 Subject: [PATCH 02/14] 0.0.226 upd mobile_styles.css --- static/css/styles(boris).css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 9729f47..8bbb6cd 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1657,7 +1657,7 @@ } .another_subscribe{ - width: 98%; + width: calc(100% - 40px); padding: 0 20px; background: #FFFFFF; box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20); From 2685e8016135ebe581a500d581a47221c06bb44f Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 16 Nov 2023 17:27:49 +0300 Subject: [PATCH 03/14] 0.0.227 upd styles(boris).css --- static/css/styles(boris).css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 8bbb6cd..ed42ebb 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1657,7 +1657,7 @@ } .another_subscribe{ - width: calc(100% - 40px); + width: calc(100% - 50px); padding: 0 20px; background: #FFFFFF; box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20); From a97d9ec2bc924776e8a3665162604b31543b535c Mon Sep 17 00:00:00 2001 From: borissedw Date: Fri, 17 Nov 2023 17:10:07 +0300 Subject: [PATCH 04/14] 0.0.360 --- static/css/mobile_styles.css | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 6924cb7..820e747 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -515,6 +515,7 @@ position: absolute; width: 320px; top: 46px; + display: none; } .menu_buttons.left.close{ @@ -536,15 +537,15 @@ padding: 7px 18px 7px 18px; } .menu_buttons.right.open{ - right: 0; - transition: 200ms; - position: absolute; - display: block; - /* padding-top: 10px; */ - width: 320px; - top: 0; - border-radius: 10px; -} + right: 0; + transition: 200ms; + position: absolute; + /* padding-top: 10px; */ + width: 320px; + top: 0; + border-radius: 10px; + display: block; + } .menu_buttons.left.open{ left: 0; From 6515979251ac003287f637301fe7140f016f802d Mon Sep 17 00:00:00 2001 From: borissedw Date: Fri, 17 Nov 2023 19:58:09 +0300 Subject: [PATCH 05/14] 0.0.361 --- static/css/mobile_styles.css | 56 ++++++++++++++++----------------- static/css/styles(boris).css | 60 +++++++++++++++++++++++++++++++----- static/css/styles.css | 7 +++-- templates/pages/p_main.html | 32 ++++++++++++------- 4 files changed, 105 insertions(+), 50 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 820e747..eb64c2e 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -84,7 +84,7 @@ border-top: 2px solid #E6E6E6; border-right: 2px solid #E6E6E6; border-bottom: 2px solid #E6E6E6; - width: 40.5%; + width: 60px; } .abbreviation_airport_in_search{ float: left; @@ -92,7 +92,7 @@ border-right: 2px solid #E6E6E6; border-bottom: 2px solid #E6E6E6; height: 96%; - width: 40%; + /*width: 40%;*/ } .from_address_point_txt.find_route.first{ @@ -103,7 +103,7 @@ } .to_address_point_txt.find_route{ - width: 55.6%; + /*width: 55.6%;*/ float: left; border-top: 2px solid #E6E6E6; border-left: 2px solid #E6E6E6; @@ -498,7 +498,7 @@ .cut_width_f_curtain{ position: sticky; - top: 61px; + top: 0; } .menu_buttons{ /*background: #FFFFFF;*/ @@ -1051,12 +1051,12 @@ } } @media (max-width: 828px){ - .to_address_point_txt.find_route { - width: 54.6%; - } - .from_address_point_txt.find_route.first { - width: 54.1%; - } + /*.to_address_point_txt.find_route {*/ + /*width: 54.6%;*/ + /*}*/ + /*.from_address_point_txt.find_route.first {*/ + /* width: 54.1%;*/ + /*}*/ } @media (max-width: 776px){ @@ -1125,12 +1125,12 @@ } } @media (max-width: 687px){ - .to_address_point_txt.find_route { - width: 52.6%; - } - .from_address_point_txt.find_route.first { - width: 52.1%; - } + /*.to_address_point_txt.find_route {*/ + /* width: 52.6%;*/ + /*}*/ + /*.from_address_point_txt.find_route.first {*/ + /* width: 52.1%;*/ + /*}*/ .subscribe_inf{ width: 95%; @@ -1188,12 +1188,12 @@ .cont-el-form-search-carrier.last > select{ width: 100%; } - .to_address_point_txt.find_route { - width: 51.6%; - } - .from_address_point_txt.find_route.first { - width: 51.1%; - } + /* .to_address_point_txt.find_route {*/ + /* width: 51.6%;*/ + /*}*/ + /*.from_address_point_txt.find_route.first {*/ + /* width: 51.1%;*/ + /*}*/ .another_subscribe{ padding: unset; flex-direction: column; @@ -1202,13 +1202,13 @@ } @media (max-width: 466px) { - .to_address_point_txt.find_route { - width: 48.4%; - } + /*.to_address_point_txt.find_route {*/ + /* width: 48.4%;*/ + /*}*/ - .from_address_point_txt.find_route.first { - width: 47.95%; - } + /*.from_address_point_txt.find_route.first {*/ + /* width: 47.95%;*/ + /*}*/ .container_inp_w_abr { diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index ed42ebb..2284b72 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -949,12 +949,13 @@ border-left: 1px solid #E6E6E6; display: block; height: 20px; - width: 55.1%; + /*width: 55.1%;*/ float: left; background-image: none !important; margin-top: 0; padding: 20px 15.2px; border-radius: 10px 0 0 10px; + width: calc(100% - 95px); } .to_address_point_txt.find_route{ @@ -964,7 +965,7 @@ border-left: 1px solid #E6E6E6; display: block; height: 20px; - width: 55.1%; + width: calc(100% - 95px); border-radius: 0; float: left; background-image: none !important; @@ -1016,7 +1017,7 @@ padding: 20px 10px; background: url(/static/img/svg/Calendar.svg) white 50%; background-repeat: no-repeat; - background-position: right 5% bottom 45%; + background-position: right 2% bottom 45%; } @@ -1060,8 +1061,8 @@ .abbreviation_airport_in_search{ display: inline-block; float: left; - width: 29%; height: 97%; + width: 60px; border-top: 1px solid #E6E6E6; border-right: 1px solid #E6E6E6; border-bottom: 1px solid #E6E6E6; @@ -1090,8 +1091,8 @@ } -.block-filters-find-route{ - min-height: 660px; +.block-filters-find-route { + 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%; @@ -1100,8 +1101,9 @@ position: sticky; top: 76px; border-radius: 10px; + max-height: calc(100vh - 125px); + overflow-y: auto; } - .block_w_paging.routes{ width: 68%; float: right; @@ -2442,8 +2444,50 @@ transition: 200ms; } +/* news rewrite*/ +.news_block{ + display: flex; + flex-wrap: wrap; + width: 100%; + justify-content: center; +} +.cont_one_news{ + width: 300px; + display: block; + text-decoration: none; + color: #000000; + margin: 20px; + background: #FFFFFF; + box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20); + padding: 15px; + border-radius: 10px; +} + +.cont_img_one_news{ + height: 250px; + overflow: hidden; +} + +.img_one_news{ + display: block; + aspect-ratio: 4/3; + /*height: 300px;*/ + object-fit: cover; +} + +.cont_content_one_news{ + height: calc(100% - 340px); +} + /*.subscribe_type_txt .f-r{*/ /* color: #FF613A;*/ -/*}*/ \ No newline at end of file +/*}*/ + + +.container_descript_one_news{ + width: 100%; + overflow-wrap: break-word; +} + diff --git a/static/css/styles.css b/static/css/styles.css index c1c6187..eca7e0e 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -2633,7 +2633,7 @@ details[open] summary ~ *{ } .news_item { - width: 413px; + width: 48%; margin-bottom: 2%; background-color: white; filter: drop-shadow(-1px 4px 10px rgba(198, 199, 203, 0.20)) drop-shadow(0px -1px 10px rgba(198, 199, 203, 0.20)); @@ -2659,9 +2659,10 @@ details[open] summary ~ *{ .news_img>img{ object-fit: cover; - height: 240px; - width: 370px; + width: 100%; border-radius: 10px; + aspect-ratio: 4 / 3; + max-height: 300px; } diff --git a/templates/pages/p_main.html b/templates/pages/p_main.html index 18fb866..e222cfb 100644 --- a/templates/pages/p_main.html +++ b/templates/pages/p_main.html @@ -239,20 +239,30 @@ {##} {# {% endfor %}#} {#
#} +
{% for art in articles %} -
- -
-
{{ art.name }}
-
- {{ art.description|truncatechars:100 }} -
+ +
+ +
+
+
+ {{ art.name|truncatechars:100 }}
- -
- - {#
{{ art.text|safe }}
#} +
+ {{ art.description|truncatechars:100 }} +
+
+ {% endfor %} +
+ + +{# {% url "article_one" art.url %}#} +{# {{ MEDIA_URL }}{{ art.picture }}#} +{# {{ art.description|truncatechars:100 }}#} + + {#
#}
From a7491c545c4b62795c6a29f21c79d172257065b7 Mon Sep 17 00:00:00 2001 From: SBD Date: Sat, 18 Nov 2023 12:28:31 +0300 Subject: [PATCH 06/14] 0.8.353 --- static/css/styles(boris).css | 37 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 2284b72..2b7ca35 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2411,20 +2411,20 @@ .menu_profile>div{ width: 274px; } -.menu_profile>div:first-of-type{ - color: #000; - font-size: 14px; - width: 274px; - border-radius: 0; - background: none; - box-shadow: none; - margin-bottom: 20px; - padding: 0; - text-align: unset; - position: unset; - height: unset; - direction: initial; -} +/*.menu_profile>div:first-of-type{*/ +/* color: #000;*/ +/* font-size: 14px;*/ +/* width: 274px;*/ +/* border-radius: 0;*/ +/* background: none;*/ +/* box-shadow: none;*/ +/* margin-bottom: 20px;*/ +/* padding: 0;*/ +/* text-align: unset;*/ +/* position: unset;*/ +/* height: unset;*/ +/* direction: initial;*/ +/*}*/ .menu_profile>div>a{ font-size: 12px; line-height: 13px; @@ -2466,7 +2466,7 @@ } .cont_img_one_news{ - height: 250px; + height: 205px; overflow: hidden; } @@ -2491,3 +2491,10 @@ overflow-wrap: break-word; } +.container_name_one_news{ + width: 100%; + overflow-wrap: break-word; + font-weight: 600; + padding-bottom: 20px; +} + From 54d5669b3bea6cda359e0094cdcb0cd794bdbd31 Mon Sep 17 00:00:00 2001 From: SBD Date: Sat, 18 Nov 2023 12:31:48 +0300 Subject: [PATCH 07/14] 0.8.354 --- static/css/styles(boris).css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 2b7ca35..b78bfb7 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2473,7 +2473,7 @@ .img_one_news{ display: block; aspect-ratio: 4/3; - /*height: 300px;*/ + height: 225px; object-fit: cover; } From 330a582a26c46f989d3b2850ad0b5d5dd1eaedf2 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Sat, 18 Nov 2023 12:36:14 +0300 Subject: [PATCH 08/14] 0.0.227 upd styles(boris).css --- static/css/mobile_styles.css | 23 +++++++++++++++++++++++ static/css/styles.css | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index eb64c2e..48e84cb 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -13,6 +13,15 @@ margin: 20px 16px; width: 42%; } + .another_subscribe{ + width: 90%; + } + .input_f_profile{ + width: calc(90% - 30.4px); + } + #img_msg_by_email{ + left: 33%; + } } @media (max-width: 1064px){ .header_logo, .header_btn_mover, .header_btn_sender{ @@ -128,6 +137,10 @@ .subscribe_inf_right_part{ width: 38%; + margin-bottom: 20px; + } + .subscribe_inf>.clear_both{ + clear: unset; } .button_profile_header{ @@ -987,6 +1000,16 @@ float: none; width: unset; } + .f-l>.clear_both{ + clear: unset; + } + .f-r>.clear_both{ + clear: unset; + } + + .block_inf_profile>.clear_both{ + clear: unset; + } .block_inf_profile{ padding-top: 20px; border-bottom:unset; diff --git a/static/css/styles.css b/static/css/styles.css index eca7e0e..cd3625b 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -977,7 +977,7 @@ input.deactive { margin-top: 7px; display: inline-block; position: relative; - left: 34%; + left: 29%; } .title_for_msg_by_email{ From 494ff26fdd6d08728b481025e6d5b70bfd0d87f6 Mon Sep 17 00:00:00 2001 From: SBD Date: Sat, 18 Nov 2023 13:02:18 +0300 Subject: [PATCH 09/14] 0.8.355 --- static/css/styles(boris).css | 14 +++++++++++++- templates/blocks/b_find_route_form.html | 2 +- templates/tb_base.html | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index b78bfb7..57d1fa6 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -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; @@ -2241,6 +2242,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;*/ diff --git a/templates/blocks/b_find_route_form.html b/templates/blocks/b_find_route_form.html index 7aab450..d4a0a47 100644 --- a/templates/blocks/b_find_route_form.html +++ b/templates/blocks/b_find_route_form.html @@ -10,7 +10,7 @@ {% if show_filter_and_results %}
- {% include "forms/f_find_route_filters_form.html" %} +{# {% include "forms/f_find_route_filters_form.html" %}#}
diff --git a/templates/tb_base.html b/templates/tb_base.html index db68493..07d5958 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -70,6 +70,18 @@
+
+
+ + {% include "forms/f_find_route_filters_form.html" %} +
+ +
Меню
+ +
+
+
+
{% block content %} From 7ae8d0ce483a3c14c9281df9db9af6f8c117ad65 Mon Sep 17 00:00:00 2001 From: SBD Date: Sat, 18 Nov 2023 13:43:52 +0300 Subject: [PATCH 10/14] 0.8.356 --- static/css/styles(boris).css | 16 +++++++++++++++ .../forms/f_find_route_filters_form.html | 4 ++-- templates/tb_base.html | 20 ++++++++++--------- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 57d1fa6..78c93e9 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2229,6 +2229,10 @@ /*display: none;*/ } +.menu_buttons.filters{ + width: 320px; +} + /* for curtain right*/ .cut_width_f_curtain{ @@ -2321,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; } diff --git a/templates/forms/f_find_route_filters_form.html b/templates/forms/f_find_route_filters_form.html index f5a7495..59f2d61 100644 --- a/templates/forms/f_find_route_filters_form.html +++ b/templates/forms/f_find_route_filters_form.html @@ -1,6 +1,6 @@ {% load static %} -
+{#
#}
Все фильтры
Способ перевозки
@@ -86,4 +86,4 @@
-
\ No newline at end of file +{#
#} \ No newline at end of file diff --git a/templates/tb_base.html b/templates/tb_base.html index 07d5958..fa06e6c 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -70,18 +70,20 @@
-
-
+ {% if not page_type == 'profile' %} +
+
- {% include "forms/f_find_route_filters_form.html" %} -
- -
Меню
- -
+ {% include "forms/f_find_route_filters_form.html" %} +
+ +
Меню
+ +
+
-
+ {% endif %}
{% block content %} From d40eed3c5df35c5e5c975a17745f77fcb2bda6b9 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Sat, 18 Nov 2023 13:44:36 +0300 Subject: [PATCH 11/14] 0.0.228 --- static/css/mobile_styles.css | 20 +++++++++++++++----- static/css/styles.css | 3 ++- static/js/user_profile.js | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 48e84cb..f1bfe93 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -153,7 +153,7 @@ margin-right: 37px; } .line_f_header{ - top: 45px; + top: 43px; } .registration_button, @@ -182,7 +182,6 @@ width: 100%; } .wrapper_tab_button{ - width: 55%; margin-top: 20px; } .benefit_img{ @@ -196,9 +195,7 @@ .button_container{ margin-top: unset; } - .tab-btn-2{ - margin: 0 0 5px 0; - } + button#more_button{ width: 50%; margin-top: 40px; @@ -1222,6 +1219,12 @@ flex-direction: column; justify-content: unset; } + + .dropdown-content{ + width: 190px; + top: 27px; + left: -83px; + } } @media (max-width: 466px) { @@ -1254,6 +1257,13 @@ } @media (max-width: 360px){ + .wrapper_tab_button{ + width: 55%; + /*margin-top: 20px;*/ + } + + + } diff --git a/static/css/styles.css b/static/css/styles.css index cd3625b..468c278 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1107,7 +1107,7 @@ section.login>form>div>div:nth-child(5)>a { section.profile { /*padding: 60px 0;*/ margin-bottom: 120px; - width: 75%; + width: 74%; float: left; } @@ -1343,6 +1343,7 @@ h2.title_new_route{ .errorlist>li{ color:red; margin-left: 12px; + font-size: 14px; } span.errorlist{ color: red; diff --git a/static/js/user_profile.js b/static/js/user_profile.js index ed8c892..35eb886 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -509,6 +509,9 @@ function sendRoute(el, routeID = null){ // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html + // document.querySelector(".tab_user_messanger.select").scrollIntoView({behavior: "smooth",block:'nearest',inline:'nearest'}); + + let list_div = document.querySelectorAll('.menu_profile div'); let my_routes = document.getElementById("my_routes_id") list_div.forEach(el=>{ el.classList.remove('selected'); }); From 70002f4efb101c14abe1d0725c6d5ca528fa9340 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Sat, 18 Nov 2023 15:02:26 +0300 Subject: [PATCH 12/14] 0.0.229 scroll to element after edit --- static/js/user_profile.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 35eb886..9050a61 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -509,6 +509,16 @@ function sendRoute(el, routeID = null){ // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html + // let dataset = document.querySelector(`[data-number-of-route=${routeID}]`) + + let el_route = document.querySelector(".carrier-card") + let el_route_id = el_route.dataset.numberOfRoute; + if(el_route_id){ + el_route.scrollIntoView(true); + } + + + // document.querySelector(".tab_user_messanger.select").scrollIntoView({behavior: "smooth",block:'nearest',inline:'nearest'}); From bd4a2e7507038df20c8f7e9d1cfa164ad442d132 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Sat, 18 Nov 2023 15:51:45 +0300 Subject: [PATCH 13/14] 0.0.230 --- static/js/user_profile.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 9050a61..cf11d1a 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -509,13 +509,17 @@ function sendRoute(el, routeID = null){ // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html - // let dataset = document.querySelector(`[data-number-of-route=${routeID}]`) + // let dataset = document.querySelector(`[data-number-of-route=${"routeID"}]`) - let el_route = document.querySelector(".carrier-card") - let el_route_id = el_route.dataset.numberOfRoute; - if(el_route_id){ - el_route.scrollIntoView(true); - } + + // let el_route_id = document.querySelector(`[data-number-of-route="${routeID}"]`); + // let el_route = document.querySelectorAll(".carrier-card") + + // + // let el_route_id = el_route.dataset.numberOfRoute; + // if(el_route_id){ + // el_route.scrollIntoView(true); + // } From 8f76b484ba20b303af33d3d06b89794d854c3664 Mon Sep 17 00:00:00 2001 From: SBD Date: Sat, 18 Nov 2023 16:30:27 +0300 Subject: [PATCH 14/14] 0.8.357 --- RoutesApp/views.py | 1 + static/css/mobile_styles.css | 14 ++++ static/css/styles(boris).css | 84 ++++++++++++++++++- static/js/filters_functions_find_route.js | 5 +- static/js/user_profile_2.js | 2 +- .../forms/f_find_route_filters_form.html | 34 +++++--- templates/tb_base.html | 11 +-- 7 files changed, 127 insertions(+), 24 deletions(-) diff --git a/RoutesApp/views.py b/RoutesApp/views.py index 98cdfe9..19fab4e 100644 --- a/RoutesApp/views.py +++ b/RoutesApp/views.py @@ -32,6 +32,7 @@ def route_search_results_View(request): 'show_filter_and_results': True, 'owner_type': data['owner_type'], 'last_el': routes_Dict['last_el'], + 'page_type': 'routes' } if 'from_address_point_txt' in routes_Dict: data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']}) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index f1bfe93..f3a11cb 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -534,6 +534,16 @@ position: absolute; width: 320px; } + .menu_buttons.left.close.filters{ + left: -347px; + transition: 200ms; + position: absolute; + width: 320px; + } + .block_w_paging.routes { + width: 100%; + float: right; + } .menu_buttons.left .handler_menu{ transform: rotate(90deg); left: -48px; @@ -618,6 +628,7 @@ .text_f_curtain{ display: inline-block; + font-size: 13px; } .menu_profile{ @@ -643,6 +654,9 @@ top: 0; right: 0; } + .block_overlay.show.routes{ + display: block; + } #customer>a, #mover>a{ left: 5%; } diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 78c93e9..af4b931 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2300,6 +2300,20 @@ position: absolute; width: 320px; } + +.menu_buttons.left.close.filters{ + width: 294px; + background: #FFFFFF; + border-radius: 10px; + max-height: 83vh; + left: 0; + padding: 13px; + transition: 200ms; + /* position: fixed; */ + float: left; + text-align: left; + top: 0; +} .menu_buttons.right.open{ right: 0; transition: 200ms; @@ -2326,15 +2340,16 @@ } .menu_buttons.left.open.filters{ - width: 300px; + width: 294px; background: #FFFFFF; border-radius: 10px; max-height: 83vh; left: 0; - padding: 10px; + padding: 13px; transition: 200ms; /* position: fixed; */ float: left; + text-align: left; } .support .menu_buttons.left.open{ @@ -2526,3 +2541,68 @@ padding-bottom: 20px; } +/* checkbox type transport*/ + +.checkbox_type_transport{ + width: 100%; + display: block; + margin-bottom: 25px; +} + + + +.input_f_checkbox_type_transport{ + display: none; +} + +.label_f_checkbox_type_transport{ + width: 100%; + display: block; +} + +.trigger_f_type_transport{ + width: 30px; + height: 30px; + border: 1px solid #E6E6E6; + float: left; + border-radius: 10px; +} + +.input_f_checkbox_type_transport:checked + label > .trigger_f_type_transport{ + background: #FF613A; +} + +.img_f_checkbox_type_transport{ + display: inline-block; + padding-top: 11px; + padding-left: 5px; + width: 12px; +} + +.span_f_checkbox_type_transport{ + color: #000000; + float: right; + display: block; + width: calc(100% - 55px); + padding-left: 5px; + padding-top: 5px; + +} + +.block_overlay.show.routes{ + display: none; +} + +.menu_buttons.left.close.filters{ + width: 294px; + background: #FFFFFF; + border-radius: 10px; + max-height: 83vh; + left: 0; + padding: 13px; + transition: 200ms; + /* position: fixed; */ + float: left; + text-align: left; + top: 0; +} \ No newline at end of file diff --git a/static/js/filters_functions_find_route.js b/static/js/filters_functions_find_route.js index 18d8683..66b3b56 100644 --- a/static/js/filters_functions_find_route.js +++ b/static/js/filters_functions_find_route.js @@ -92,12 +92,11 @@ function ajax_for_filter (data_d,get_url){ let new_page_routes = document.createElement("div") new_page_routes.classList.add("page_paging_elements_" + page_iterator) let insert_place_main = document.querySelector(".block-finded-routes") - if (insert_place_main){ + if (insert_place_main) { insert_place_main.innerHTML = '' insert_place_main.appendChild(new_page_routes) } - - // $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator); + // // $(new_page_routes).insertAfter(".page_pagingelements_" + old_page_iterator); // let line_separator = document.createElement("div") // line_separator.classList.add("line_separator_page_w_el") // $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator); diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 8cdcc8e..2c7d141 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -779,7 +779,7 @@ function open_curtain (left=null,right=null,overlay=null,close=null){ handler_text.style.fontSize = '13px' } else { handler_text.innerHTML = curtain_name - handler_text.style.fontSize = '16px' + handler_text.style.fontSize = '13px' } if (!curtain.classList.contains('open')){ diff --git a/templates/forms/f_find_route_filters_form.html b/templates/forms/f_find_route_filters_form.html index 59f2d61..c9793f5 100644 --- a/templates/forms/f_find_route_filters_form.html +++ b/templates/forms/f_find_route_filters_form.html @@ -16,19 +16,27 @@ {#
#} {% for item in route_form.fields.type_transport.choices %} {% if forloop.counter0 > 0 %} -
- - -
- {% if not page_type == 'profile' %} + {% if page_type == 'routes' %}
-
+
{% include "forms/f_find_route_filters_form.html" %}
-
Меню
+
Фильтры