Merge remote-tracking branch 'origin/main'

This commit is contained in:
SDE
2023-07-31 17:57:02 +03:00
6 changed files with 91 additions and 11 deletions

View File

@@ -112,4 +112,40 @@
min-height: 200px;
min-width: 100%;
max-width: 100%;
}
resize: none;
}
.el-form-create-ticket-textarea:focus-visible{
border: none;
outline: none;
}
.create-ticket-btn{
width: 200px;
height: 60px;
padding: 20px 20px;
background: #FF613A;
color: #FFFFFF;
border-radius: 10px;
float: left;
}
.attach-file-btn{
background: url("/static/img/svg/attach_a_file.svg");
background-size: 60px;
background-repeat: no-repeat;
background-position: center;
height: 60px;
width: 60px;
margin-left: 20px;
}
.create-ticket-file{
display: block;
opacity: 0;
}
.form-create-tickets-btns{
width: 100%;
margin-top: 40px;
}

View File

@@ -6,7 +6,16 @@
}
@font-face {
font-family: Inter;
src:
/*url("/static/fonts/inter/Inter-Black.ttf"),*/
/*url("/static/fonts/inter/Inter-Bold.ttf"),*/
/*url("/static/fonts/inter/Inter-ExtraBold.ttf"),*/
/*url("/static/fonts/inter/Inter-ExtraLight.ttf"),*/
/*url("/static/fonts/inter/Inter-Light.ttf"),*/
url("/static/fonts/inter/Inter-Medium.ttf"),
url("/static/fonts/inter/Inter-Regular.ttf"),
url("/static/fonts/inter/Inter-SemiBold.ttf"),
url("/static/fonts/inter/Inter-Thin.ttf");
}
/* Links */
@@ -1195,16 +1204,16 @@ input#id_cargo_type{
display: inline-block;
}
#edit_route {
button#edit_route {
display: block;
height: 44px;
width: 285px;
width: 86%;
background: #FF613A;
color: #FFF;
font-family: Inter;
font-size: 18px;
font-size: 16px;
font-style: normal;
font-weight: 600;
font-weight: 500;
text-decoration: none;
line-height: 26px;
border-radius: 10px;
@@ -1228,13 +1237,13 @@ button.confirm_remove{
color: white;
font-style: normal;
font-weight: 600;
margin-right: 3px;
}
button.cancel_remove{
height: 44px;
width: 45%;
width: 46%;
background: #808080cc;
border-radius: 10px;
color: white;

View File

@@ -0,0 +1,6 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Frame 66">
<rect id="Rectangle 20" width="60" height="60" rx="10" fill="#E6E6E6"/>
<path id="Vector" d="M35.8182 23.4545V36C35.8182 38.4109 33.2145 40.3636 30 40.3636C26.7855 40.3636 24.1818 38.4109 24.1818 36V22.3636C24.1818 20.8582 25.8109 19.6364 27.8182 19.6364C29.8255 19.6364 31.4545 20.8582 31.4545 22.3636V33.8182C31.4545 34.4182 30.8 34.9091 30 34.9091C29.2 34.9091 28.5455 34.4182 28.5455 33.8182V23.4545H26.3636V33.8182C26.3636 35.3236 27.9927 36.5455 30 36.5455C32.0073 36.5455 33.6364 35.3236 33.6364 33.8182V22.3636C33.6364 19.9527 31.0327 18 27.8182 18C24.6036 18 22 19.9527 22 22.3636V36C22 39.3164 25.5782 42 30 42C34.4218 42 38 39.3164 38 36V23.4545H35.8182Z" fill="#272424" fill-opacity="0.6"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 829 B

View File

@@ -27,4 +27,29 @@ function countLetters () {
else {
area.setAttribute("disabled","disabled")
}
}
function attachFileCreateTicket () {
event.preventDefault()
let input = document.querySelector(".create-ticket-file")
input.click()
console.log("asd")
let data = input.value
$.ajax({
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
url: '/ru/user_account/support_create_ticket_ajax/',
type: "POST",
// async: true,
cache: false,
processData: false,
contentType: false,
// enctype: 'json',
data: data,
success: function(data){
document.querySelector(".insert-tech-place").innerHTML = data.html;
},
});
}

View File

@@ -110,7 +110,7 @@ function confirmRemove(el) {
let cancel_button = document.createElement('button')
cancel_button.className = "cancel_remove";
cancel_button.innerText = "Отменить удаление";
let place = btn.closest("#select-remove")
let place = btn.closest(".button_remove_route")
place.insertBefore(cancel_button, btn.nextSibling);
}
btn.removeAttribute("id", "select-remove")

View File

@@ -9,11 +9,15 @@
name="request_subject"
placeholder="Тема запроса"
>
<div class="letrs-count" style="color: #27242499;"><span class="letrs-count-span">0</span><span>/500</span></div>
<div class="letrs-count" style="color: #27242499;position: relative;top: 20px;left: 780px;display: inline-block;"><span class="letrs-count-span">0</span><span>/500</span></div>
<textarea name="enter-message"
class="el-form-create-ticket-textarea"
placeholder="Введите сообщение..."
onkeyup="countLetters()"></textarea>
<div class="form-create-tickets-btns">
<button class="create-ticket-btn">Создать тикет</button>
<button class="attach-file-btn" onclick="attachFileCreateTicket()"></button>
<input class="create-ticket-file" type="file" value="">
</div>
</form>