From e5a8c3cb8f7585259e2daf14caf706e222e96663 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 29 Nov 2023 14:59:20 +0300 Subject: [PATCH 1/6] 0.0.262 add switch on main page --- static/css/styles(boris).css | 1 + static/css/styles.css | 4 ++-- templates/forms/f_registration.html | 16 +--------------- templates/pages/p_main.html | 24 ++++++++++++++++++++++-- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 153675e..07cbace 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -1925,6 +1925,7 @@ width: 100%; color: #272424; margin-bottom: 20px; + margin-top: 15px; } .method_transport{ diff --git a/static/css/styles.css b/static/css/styles.css index 9a10653..61d054b 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -895,7 +895,7 @@ section.register>form { background: #FFF; display: flex; height: 70px; - margin-bottom: 40px; + margin: 0 auto; } @@ -2479,7 +2479,7 @@ button#send_feedback_form{ /*tabs_on_main_page*/ .pre_bottom_block_static{ - width: 90%; + width: 100%; margin: auto; } .pre_bottom_block_static>h2{ diff --git a/templates/forms/f_registration.html b/templates/forms/f_registration.html index fe75d63..21dc32c 100644 --- a/templates/forms/f_registration.html +++ b/templates/forms/f_registration.html @@ -12,21 +12,7 @@
{% csrf_token %} -{#
#} -{#
Перевозчик
#} -{#
Отправитель
#} -{#
#} -{#
#} -{#
#} -{##} -{# #} -{# #} -{#
#} -{#
#} -{# #} -{# #} -{#
#} -{#
#} +{#
diff --git a/templates/pages/p_main.html b/templates/pages/p_main.html index b55a040..734e0fc 100644 --- a/templates/pages/p_main.html +++ b/templates/pages/p_main.html @@ -22,7 +22,27 @@

+ +{#
#} +{#
Перевозчик
#} +{#
Отправитель
#} +{#
#} +
+ + + + +
+
+ + +
+ +
+ + +
@@ -158,11 +178,11 @@
{% translate "в 3 раза" %}
{% translate "быстрее других сервисов" %}
{% translate "Почтовые сервисы доставляет посылки в среднем за 10 дней. С нами - быстрее!" %}
- +
{#
#} -{#
#} +{# #} {#
#}
From d9103e62a79c5ede1d58be8cd49bbbcfb27aba49 Mon Sep 17 00:00:00 2001 From: SBD Date: Wed, 29 Nov 2023 15:00:28 +0300 Subject: [PATCH 2/6] 0.8.411 --- static/css/mobile_styles.css | 4 +++- static/css/styles(boris).css | 1 + static/js/user_profile_2.js | 13 +++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index db61f6b..dd81372 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -1137,10 +1137,12 @@ float: unset; /*background: linear-gradient(92deg, #000000 1%, #ffffff 93%, #ffffff);*/ /*background: linear-gradient(90deg, #000000 1%, #ffffff 81%, #ffffff);*/ - -webkit-text-fill-color: unset; padding-right: unset; font-size: 14px; top: unset; + background: linear-gradient(99deg, #000000 1%, #ffffff 16%, #ffffff); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; } .email_carrier{ display: inline-block; diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 07cbace..6ebfb5d 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -2621,6 +2621,7 @@ .menu_profile{ width: 320px; text-align: -webkit-center; + text-align: -moz-center; padding: 0; overflow-y: auto; height: calc(100vh - 95px); diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 84c2e29..7b9b65f 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -55,12 +55,13 @@ 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" - }) + // let header = document.querySelector(".info_profile") + // header.scrollIntoView({ + // behavior: "smooth", + // block: "end", + // inline: "nearest" + // }) + document.body.scrollTop = document.documentElement.scrollTop = 0; middleWareJS() let user_type = getInfoAboutUser() if (user_type === 'mobile') { From dc92877beb35517a2411667726585ca9ca04e6c6 Mon Sep 17 00:00:00 2001 From: SBD Date: Wed, 29 Nov 2023 15:05:13 +0300 Subject: [PATCH 3/6] 0.8.412 --- static/css/styles(boris).css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 6ebfb5d..16f1488 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -936,6 +936,8 @@ border-radius: 10px; display: flex; padding: 13px; + position: relative; + z-index: 1000; } .container_form_search_carrier > form{ From 2fb00ee112fb05a39e665bb4f51ae39b29294699 Mon Sep 17 00:00:00 2001 From: SBD Date: Wed, 29 Nov 2023 15:14:20 +0300 Subject: [PATCH 4/6] 0.8.413 --- static/js/user_profile_2.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 7b9b65f..8c6ecaf 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -55,13 +55,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(".info_profile") - // header.scrollIntoView({ - // behavior: "smooth", - // block: "end", - // inline: "nearest" - // }) - document.body.scrollTop = document.documentElement.scrollTop = 0; + let header = document.querySelector(".info_profile") + header.scrollIntoView({ + behavior: "smooth", + block: "end", + inline: "nearest" + }) middleWareJS() let user_type = getInfoAboutUser() if (user_type === 'mobile') { From 3880b97cae9fe5bd6698bcd5b522275feb401b61 Mon Sep 17 00:00:00 2001 From: SBD Date: Wed, 29 Nov 2023 15:22:33 +0300 Subject: [PATCH 5/6] 0.8.414 --- .../etc_operations_for_chat_socket.js | 24 ++++++++++++------- static/js/chat_sockets.js | 1 + 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js index 543ab89..0aac18f 100644 --- a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js +++ b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js @@ -21,15 +21,21 @@ function loader_show_message (data) { let send_btn = document.querySelector(".send-message") let at = document.querySelector(".attach-file-btn-message") if (loader){ - if (loader.classList.contains("show")){ - send_btn.classList.remove("hide") - loader.classList.remove("show") - at.classList.remove("loader") - } else { - send_btn.classList.add("hide") - loader.classList.add("show") - at.classList.add("loader") - } + send_btn.classList.add("hide") + loader.classList.add("show") + at.classList.add("loader") + } else { + console.log("cannot find loader") + } +} +function loader_hide_message (data) { + let loader = document.querySelector(".loader_show_message"); + let send_btn = document.querySelector(".send-message") + let at = document.querySelector(".attach-file-btn-message") + if (loader){ + send_btn.classList.remove("hide") + loader.classList.remove("show") + at.classList.remove("loader") } else { console.log("cannot find loader") diff --git a/static/js/chat_sockets.js b/static/js/chat_sockets.js index 7d9e2c6..6fbeaa8 100644 --- a/static/js/chat_sockets.js +++ b/static/js/chat_sockets.js @@ -106,6 +106,7 @@ function wsReceiveData (e) { play_required_beep(data,beep) } loader_show_message(data) + loader_hide_message(data) } From f2fd95b04e5697e9853e2a21b7d0e30f5be849d6 Mon Sep 17 00:00:00 2001 From: SBD Date: Wed, 29 Nov 2023 15:24:12 +0300 Subject: [PATCH 6/6] 0.8.415 --- static/js/user_profile_2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 8c6ecaf..84c2e29 100644 --- a/static/js/user_profile_2.js +++ b/static/js/user_profile_2.js @@ -55,7 +55,7 @@ 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(".info_profile") + let header = document.querySelector("header") header.scrollIntoView({ behavior: "smooth", block: "end",