Merge remote-tracking branch 'origin/main'

This commit is contained in:
SDE
2024-04-23 10:18:00 +03:00
4 changed files with 48 additions and 16 deletions

View File

@@ -1222,7 +1222,7 @@
padding-right: unset; padding-right: unset;
font-size: 14px; font-size: 14px;
top: unset; top: unset;
background: linear-gradient(99deg, #000000 1%, #ffffff 16%, #ffffff); /*background: linear-gradient(99deg, #000000 1%, #ffffff 16%, #ffffff);*/
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
} }

View File

@@ -1414,7 +1414,7 @@
text-decoration: none; text-decoration: none;
color: #000000; color: #000000;
font-size: 16px; font-size: 16px;
padding-bottom: 10px; padding: 10px 0 10px;
display: block; display: block;
} }
@@ -1422,7 +1422,7 @@
position: relative; position: relative;
top: 6px; top: 6px;
/*background: linear-gradient(99deg, #040404 56%, #9f9f9f 25%, #ffffff);*/ /*background: linear-gradient(99deg, #040404 56%, #9f9f9f 25%, #ffffff);*/
background: linear-gradient(99deg, #000000 1%, #ffffff 16%, #ffffff); /*background: linear-gradient(99deg, #000000 1%, #ffffff 16%, #ffffff);*/
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
transition: 200ms; transition: 200ms;
@@ -1446,6 +1446,8 @@
white-space: unset; white-space: unset;
} }
.phones_carrier input{ .phones_carrier input{
display: none; display: none;
} }
@@ -1461,7 +1463,7 @@
position: relative; position: relative;
top: 5px; top: 5px;
/*background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff);*/ /*background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff);*/
background: linear-gradient(99deg, #040404 2%, #ffffff 13%, #ffffff); /* background: linear-gradient(99deg, #040404 2%, #ffffff 13%, #ffffff);*/
-webkit-background-clip: text; -webkit-background-clip: text;
-webkit-text-fill-color: transparent; -webkit-text-fill-color: transparent;
transition: 200ms; transition: 200ms;
@@ -1481,6 +1483,7 @@
white-space: unset; white-space: unset;
} }
.email_carrier input{ .email_carrier input{
display: none; display: none;
} }
@@ -1574,6 +1577,17 @@ a.open_inf_carrier{
position: relative; position: relative;
top: 11px; top: 11px;
left: 4px; left: 4px;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.name_carrier.active{
background: unset;
-webkit-background-clip: unset;
-webkit-text-fill-color: unset;
overflow: unset;
overflow-wrap: break-word;
white-space: unset;
} }
.from-to-city-text{ .from-to-city-text{

View File

@@ -4,16 +4,20 @@ function show_inf_carrier (el) {
let form = el.closest("div[name='form_carrier']") let form = el.closest("div[name='form_carrier']")
let finish_form = form.children let finish_form = form.children
let form_open = finish_form[0].children let form_open = finish_form[0].children
let ph_1 = form_open[0] let nm_1 = form_open[1]
let em_1 = form_open[1] let ph_1 = form_open[2]
let em_1 = form_open[3]
let btn_open_chat = finish_form[1] let btn_open_chat = finish_form[1]
let els = [ph_1.querySelectorAll(".el_for_open_el")[0],em_1.querySelectorAll(".el_for_open_el")[0]] let els = [nm_1, ph_1.querySelectorAll(".el_for_open_el")[0],em_1.querySelectorAll(".el_for_open_el")[0]]
// let iter_lists = 0 // let iter_lists = 0
for (let i = 0;i < els.length;i++){ for (let i = 0;i < els.length;i++){
els[i].classList.toggle("active") els[i].classList.toggle("active")
// iter_lists++ // iter_lists++
} }
// let btn_open_chat = finish_form[3] // let btn_open_chat = finish_form[3]
// ph_1.parentElement.children[2].classList.toggle("active"); // ph_1.parentElement.children[2].classList.toggle("active");

View File

@@ -86,22 +86,36 @@
<img class="inf_carrier_icon" src="{% static "/img/svg/cargo.svg" %}"/> <img class="inf_carrier_icon" src="{% static "/img/svg/cargo.svg" %}"/>
{% endif %} {% endif %}
</div> </div>
<div> <div>
<img class="route_contact_avatar" {% if route.owner.user_profile.avatar %} {# <img class="route_contact_avatar" {% if route.owner.user_profile.avatar %}#}
src="{{ route.owner.user_profile.avatar.url }}" {# src="{{ route.owner.user_profile.avatar.url }}"#}
{% else %}src="{% static "img/svg/user_icon_standart.png" %}"{% endif %}> {# {% else %}src="{% static "img/svg/user_icon_standart.png" %}"{% endif %}>#}
{% if user.is_authenticated %} {# {% if user.is_authenticated %}#}
<span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span> {# <span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>#}
{% endif %} {# <span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>#}
{% if not user.is_authenticated %} {# {% endif %}#}
<span class="name_carrier"></span> {# {% if not user.is_authenticated %}#}
{% endif %} {# <span class="name_carrier"></span>#}
{# {% endif %}#}
</div> </div>
<div name="form_carrier"> <div name="form_carrier">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<div class="inf_carrier"> <div class="inf_carrier">
<img class="route_contact_avatar" {% if route.owner.user_profile.avatar %}
src="{{ route.owner.user_profile.avatar.url }}"
{% else %}src="{% static "img/svg/user_icon_standart.png" %}"{% endif %}>
{% if user.is_authenticated %}
{# <span class="name_carrier">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>#}
<span class="name_carrier{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.owner.last_name }} {{ route.owner.first_name }}</span>
{% endif %}
{% if not user.is_authenticated %}
<span class="name_carrier"></span>
{% endif %}
<a class="phones_carrier" data-href="tel:{{ route.phone }}"> <a class="phones_carrier" data-href="tel:{{ route.phone }}">
<img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/> <img class="inf_carrier_icon" src="{% static "/img/svg/phone.svg" %}"/>
<span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.phone }}</span> <span class="phones_carrier_span{% if route.owner == user %} active{% endif %} el_for_open_el">{{ route.phone }}</span>