diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index b076cfa..c021c92 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -378,7 +378,7 @@ } .block-chat{ - width: 67%; + width: 66%; height: 63vh; border-radius: 10px; border: 1px solid #E6E6E6; @@ -400,6 +400,11 @@ overflow-y: auto; } +.bottom_part_of_chats{ + height: calc(100% - 60px); + position: relative; +} + .container-header-chat{ border-radius: 10px; border: 1px solid #E6E6E6; @@ -443,7 +448,7 @@ } .container-messages{ - height: calc(74% - 70px); + height: calc(100% - 175px); width: 100%; /* transform: rotate(180deg); */ overflow-y: auto; @@ -466,6 +471,8 @@ border-radius: 10px; border: 1px solid #E6E6E6; padding: 0 20px 0 20px; + position: absolute; + bottom: 43px; } .footer-chat.hide{ @@ -2109,4 +2116,17 @@ border-radius: 10px; font-weight: 600; font-size: 18px; +} + +/*p_main corrects*/ + +.a_btn_standart{ + padding: 20px 76px; + border-radius: 10px; + background: #FF613A; + display: block; + color: #FFFFFF; + font-size: 16px; + margin: 0; + max-width: 330px; } \ No newline at end of file diff --git a/static/css/styles.css b/static/css/styles.css index fb5a448..78caa2d 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1803,7 +1803,7 @@ button.cancel_remove{ font-style: normal; font-weight: 700; line-height: 52px; - margin-bottom: 20px; + margin-bottom: 40px; } .title_static_wrapper{ text-align: center; @@ -1922,10 +1922,8 @@ button#more_button{ .mid_block_static{ - padding: 40px 40px 0px 40px; + margin: 120px 40px 0 40px; width: 90%; - margin: auto; - } .mid_block_static>.text_wrapper>span{ display: block; @@ -1948,7 +1946,8 @@ button#more_button{ align-items: flex-start; gap: 20px; justify-content: space-around; - margin-bottom: 120px + margin-bottom: 120px; + margin-top: 60px; } .benefit_img>img{ @@ -1981,7 +1980,6 @@ button#more_button{ .benefit_img_about_service>figure{ display: flex; width: 197px; - padding-top: 20px; flex-direction: column; justify-content: flex-end; align-items: center; @@ -2064,7 +2062,8 @@ button#more_button{ .button_container{ - text-align: center; + text-align: -webkit-center; + width: 100%; } #how_it_work_b{ @@ -2135,7 +2134,9 @@ button#more_button{ width: 100%; height: 130px; min-width: 65px; - padding: 10px 0px 0px 10px; + padding: 10px 0 0 10px; + max-width: 100%; + min-width: 100%; } .counter-box>textarea:focus{ outline: none !important; @@ -2292,7 +2293,7 @@ button#send_feedback_form{ margin: auto; } .pre_bottom_block_static>h2{ - margin-top: 100px; + margin-top: 120px; } .cards_wrapper{ @@ -2313,6 +2314,7 @@ button#send_feedback_form{ /* Shadow 1 */ box-shadow: -1px 4px 10px 0px rgba(198, 199, 203, 0.20), 0px -1px 10px 0px rgba(198, 199, 203, 0.20); margin: 10px; + padding: 0 20px 30px 20px; } .cards_item_1_left, .cards_item_2_left, @@ -2459,7 +2461,7 @@ button#send_feedback_form{ align-items: center; } .faq_main_page>h2{ - margin-top: 100px; + margin-top: 120px; } @@ -2524,11 +2526,11 @@ details[open] summary ~ *{ /*margin: 0 80px 120px 80px;*/ justify-content: space-between; flex-wrap: wrap; - + width: 100%; } .news_item { - width: 413px; + width: 32%; margin-bottom: 2%; background-color: white; filter: drop-shadow(-1px 4px 10px rgba(198, 199, 203, 0.20)) drop-shadow(0px -1px 10px rgba(198, 199, 203, 0.20)); diff --git a/static/js/filters_functions_find_route.js b/static/js/filters_functions_find_route.js index 97c0bbe..f658d54 100644 --- a/static/js/filters_functions_find_route.js +++ b/static/js/filters_functions_find_route.js @@ -74,15 +74,16 @@ function ajax_for_filter (data_d,get_url){ // let element = document.createElement("img") // element.classList.add("loader_filters_routes") // element.src = "/static/img/svg/loader.svg" - let div = document.createElement("div") - div.classList.add("width-100") - div.classList.add("text-align-center") - div.classList.add("mb-10") - div.innerHTML = "" - let ins_bef_el = document.querySelector(".block-finded-routes").firstChild - - $(div).insertBefore(ins_bef_el) + // let div = document.createElement("div") + // div.classList.add("width-100") + // div.classList.add("text-align-center") + // div.classList.add("mb-10") + // + // div.innerHTML = "" + // let ins_bef_el = document.querySelector(".block-finded-routes").firstChild + // + // $(div).insertBefore(ins_bef_el) let new_page_routes = document.createElement("div") new_page_routes.classList.add("page_paging_elements_" + page_iterator) @@ -111,10 +112,13 @@ function ajax_for_filter (data_d,get_url){ document.querySelector(`.page_paging_elements_${old_page_iterator}`).innerHTML = data.html } else { old_page_iterator = 1 - - let new_insert_place = document.createElement("div") - + document.querySelector(`.page_paging_elements_${old_page_iterator}`).innerHTML = data.html } + document.querySelector(".loader_filters_routes").classList.toggle("show") + + // if (document.querySelector(".loader_filters_routes")){ + // document.querySelector(".loader_filters_routes").classList.remove("show") + // } } // window.location.href = window.location.href + "?" + get_url diff --git a/templates/blocks/profile/b_chats.html b/templates/blocks/profile/b_chats.html index 3e35e36..9c951e4 100644 --- a/templates/blocks/profile/b_chats.html +++ b/templates/blocks/profile/b_chats.html @@ -51,22 +51,24 @@ -
- {% include "blocks/profile/b_messages_container.html" %} -
- - -
@@ -225,18 +225,35 @@
- {% for art in articles %} - +{# {% for art in articles %}#} +{##} +{#
#} +{#
#} +{#
{{ art.name }}
#} +{#
#} +{# {{ art.description|truncatechars:100 }}#} +{#
#} +{#
#} +{#
#} +{##} +{# {% endfor %}#} +{#
#} + {% for art in articles %}
-
-
{{ art.name }}
-
- {{ art.description|truncatechars:100 }} -
-
+ +
+
{{ art.name }}
+
+ {{ art.description|truncatechars:100 }} +
+
+
- {% endfor %} + {#
{{ art.text|safe }}
#} + {% endfor %} + +{#
#}