diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index 9ee83cf..2d270b9 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -700,7 +700,7 @@ } .left-part-carrier-card{ - width: calc(70% - 20px); + width: calc(65% - 20px); float: left; padding: 20px; } @@ -810,7 +810,7 @@ .inf_carrier{ padding-top: 15px; display: block; - + margin-bottom: 15px; } .phones_carrier{ @@ -824,16 +824,26 @@ .phones_carrier_span{ position: relative; top: 4px; - background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff); + background: linear-gradient(99deg, #040404 56%, #9f9f9f 25%, #ffffff); -webkit-background-clip: text; -webkit-text-fill-color: transparent; transition: 200ms; + width: calc(90% - 10px); + overflow: hidden; + float: right; + padding-right: 10px; +} + +.inf_carrier_icon{ + width: 10%; } .phones_carrier_span.active{ background: unset; -webkit-background-clip: unset; -webkit-text-fill-color: unset; + overflow: unset; + overflow-wrap: break-word; } .phones_carrier input{ @@ -849,17 +859,23 @@ .email_carrier_span{ position: relative; - top: 6px; + top: 2px; background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff); -webkit-background-clip: text; -webkit-text-fill-color: transparent; transition: 200ms; + width: calc(90% - 10px); + float: right; + overflow: hidden; + padding-right: 10px; } .email_carrier_span.active{ background: unset; -webkit-background-clip: unset; -webkit-text-fill-color: unset; + overflow: unset; + overflow-wrap: break-word; } .email_carrier input{ @@ -908,7 +924,7 @@ } .inf_carrier_container{ - width: calc(30% - 61px); + width: calc(35% - 61px); float: right; padding: 20px; border-left: 1px solid #E6E6E6; diff --git a/static/js/find_route.js b/static/js/find_route.js index 53b7da3..631dce2 100644 --- a/static/js/find_route.js +++ b/static/js/find_route.js @@ -7,12 +7,18 @@ function show_inf_carrier (el) { let btn_open_chat = form[3] ph_1.parentElement.children[1].classList.toggle("active"); - ph_2.parentElement.children[1].classList.toggle("active"); - em_2.parentElement.children[1].classList.toggle("active"); - if (el.innerHTML === "Скрыть контакт"){ - el.innerHTML = "Открыть контакт" - } else{ - el.innerHTML = "Скрыть контакт" + try { + ph_2.parentElement.children[1].classList.toggle("active"); + } catch { + // p } + + em_2.parentElement.children[1].classList.toggle("active"); btn_open_chat.classList.toggle("active") + if (el.style.display === "none"){ + el.style.display = "" + } else { + el.style.display = "none" + } + } \ No newline at end of file diff --git a/static/js/user_profile.js b/static/js/user_profile.js index f361e3e..899e7c6 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -1,7 +1,7 @@ function writeMessage(){ $.ajax({ headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, - url: '/ru/user_account/new_msg_to_user/', + url: '/ru/user_account/chats/', type: "POST", // async: true, cache: false, diff --git a/templates/widgets/w_carrier_card.html b/templates/widgets/w_carrier_card.html index 43f88e6..228bb20 100644 --- a/templates/widgets/w_carrier_card.html +++ b/templates/widgets/w_carrier_card.html @@ -27,27 +27,26 @@