sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SBD
2023-11-25 21:49:33 +03:00
parent 415784bf06 246974c1b8
commit d022fb231f
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
static/css/styles(boris).css
View File

@@ -412,8 +412,8 @@
height: 100px; height: 100px;
width: 100px; width: 100px;
position: absolute; position: absolute;
top: 38%; top: 35%;
left: 52%; left: 47%;
} }
.loader_chat_f_sw_chats.support.show{ .loader_chat_f_sw_chats.support.show{
@@ -421,8 +421,8 @@
height: 100px; height: 100px;
width: 100px; width: 100px;
position: absolute; position: absolute;
top: 50%; top: 38%;
left: 52%; left: 47%;
} }
.loader_chat_f_sw_chats{ .loader_chat_f_sw_chats{
@@ -2469,7 +2469,7 @@
} }
.support .menu_buttons.left.open{ .support .menu_buttons.left.open{
max-height: calc(100vh - 140px); max-height: calc(100vh - 120px);
} }
@@ -2613,7 +2613,7 @@
text-align: -webkit-center; text-align: -webkit-center;
padding: 0; padding: 0;
overflow-y: auto; overflow-y: auto;
height: calc(100vh - 120px); height: calc(100vh - 95px);
max-height: 697px; max-height: 697px;
background: #F8F8F8; background: #F8F8F8;
} }

2
static/js/user_profile_2.js
View File

@@ -23,7 +23,7 @@ function select_tab_profile (el,url,owner_type=null) {
confirm_url = `/routes/${url}/` confirm_url = `/routes/${url}/`
} }
if (window.location.href.includes("profile")){ if (window.location.href.includes("profile")){
document.querySelector(".info_profile").innerHTML = '<img src="/static/img/svg/loader.svg" style="height: 30px;position: absolute;top: 50%;left: 50%;"/>' document.querySelector(".info_profile").innerHTML = '<img src="/static/img/svg/loader.svg" style="height: 30px;position: absolute;top: 47%;left: 45%;"/>'
} }
$.ajax({ $.ajax({
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },

6
templates/widgets/w_message.html
View File

@@ -10,7 +10,11 @@
<div class="container_text_message {% get_msg_side user ticket msg %}"> <div class="container_text_message {% get_msg_side user ticket msg %}">
{% if msg.text %} {% if msg.text %}
<span class="text_message"> <span class="text_message">
{% if msg %}{{ msg.text }}{% else %}{{ ticket.text }}{% endif %} {{ msg.text }}
</span>
{% elif ticket %}
<span class="text_message">
{{ ticket.text }}
</span> </span>
{% elif msg.files %} {% elif msg.files %}
{% for file in msg.files %} {% for file in msg.files %}