From 95eeea181c0ab5e25f807c8f8384d2f1cd769a3c Mon Sep 17 00:00:00 2001 From: ArtemB Date: Mon, 31 Jul 2023 17:00:54 +0300 Subject: [PATCH 1/2] 0.0.63 add fonts --- static/css/styles.css | 23 ++++++++++++++++------- static/js/user_profile.js | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/static/css/styles.css b/static/css/styles.css index 099b7e4..169182e 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -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; diff --git a/static/js/user_profile.js b/static/js/user_profile.js index 89188a9..966e617 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -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") From 54282c137c5dcd4dea4b8fa398828ad85720c792 Mon Sep 17 00:00:00 2001 From: borissedw Date: Mon, 31 Jul 2023 17:12:50 +0300 Subject: [PATCH 2/2] 0.0.5 --- static/css/styles(boris).css | 38 ++++++++++++++++++- static/img/svg/attach_a_file.svg | 6 +++ static/js/user_profile(boris).js | 25 ++++++++++++ templates/blocks/profile/b_create_ticket.html | 8 +++- 4 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 static/img/svg/attach_a_file.svg diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index c74ec8b..d9d779a 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -112,4 +112,40 @@ min-height: 200px; min-width: 100%; max-width: 100%; -} \ No newline at end of file + 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; +} diff --git a/static/img/svg/attach_a_file.svg b/static/img/svg/attach_a_file.svg new file mode 100644 index 0000000..6a262c2 --- /dev/null +++ b/static/img/svg/attach_a_file.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/static/js/user_profile(boris).js b/static/js/user_profile(boris).js index fd4453c..20e8c2e 100644 --- a/static/js/user_profile(boris).js +++ b/static/js/user_profile(boris).js @@ -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; + + }, + }); + } \ No newline at end of file diff --git a/templates/blocks/profile/b_create_ticket.html b/templates/blocks/profile/b_create_ticket.html index 19430dd..6c8d99d 100644 --- a/templates/blocks/profile/b_create_ticket.html +++ b/templates/blocks/profile/b_create_ticket.html @@ -9,11 +9,15 @@ name="request_subject" placeholder="Тема запроса" > -
0/500
+
0/500
+
+ + + - +
\ No newline at end of file