Merge remote-tracking branch 'origin/main'

static/css/mobile_styles.css

@@ -23,6 +23,14 @@
     .header_logo, .header_btn_mover{
         margin-right: 20px;
     }
+    .dropbtn_lang{
+        padding: 2px 0.5px;
+        border-radius: 12px;
+
+    }
+    #ru_lang,#en_lang{
+        padding: unset;
+    }
 
     #customer_service{
         margin-right: 10px;
@@ -283,6 +291,7 @@
     }
     .button_profile_header_mobile{
         display: inline-block ;
+        margin-left: 5px;
     }
     .header_logo_mobile {
         margin-right: 37px;

static/css/styles.css

@@ -646,6 +646,14 @@ header .header-second {
     aspect-ratio: 4/3;
 }
 
+.from_address_point_txt.red_text{
+    color: #ff0000;
+}
+.to_address_point_txt.red_text{
+        color: #ff0000;
+
+}
+
 
 .header-second-item,
 .cont_header_btn_profile,
@@ -680,8 +688,9 @@ span.btn_profile_name {
 /*Language select*/
 
 .dropbtn_lang {
-    padding: 7px 0 7px 0;
+    padding: 8px 6.5px;
     cursor: pointer;
+    border-radius: 23px;
 }
 
 /* The container <div> - needed to position the dropdown content */
@@ -700,9 +709,9 @@ span.btn_profile_name {
 
 .dropbtn_lang
 {
-  background: url('/static/img/png/ru.png') no-repeat left center;
+  background: url('/static/img/svg/ru.svg') no-repeat left center;
-  padding-left: 25px;
+  /*padding-left: 25px;*/
-  width: 40px;
+  /*width: 40px;*/
     color: transparent;
 }
 
@@ -718,16 +727,19 @@ span.btn_profile_name {
 
 #ru_lang
 {
-  background: url('/static/img/png/ru.png') no-repeat left center;
+  background: url('/static/img/svg/ru.svg') no-repeat center;
     color: transparent;
-    padding: 10px;
+    padding: 6px;
+    margin: 5px 0;
+    border-radius: 5px;
 }
 
 #en_lang
 {
-  background: url('/static/img/png/en.png') no-repeat left center;
+  background: url('/static/img/svg/gb.svg') no-repeat center;
     color: transparent;
-    padding: 10px;
+    padding: 6px;
+    border-radius: 5px;
 }
 
 /* Links inside the dropdown */
@@ -754,6 +766,7 @@ span.btn_profile_name {
 
 .header-second>div>img{
     margin-right: 5px;
+    margin-left: 10px;
 }
 #customer_service{
     margin-right: 35px;

static/img/svg/gb.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icon-css-gb" viewBox="0 0 512 512">
+  <path fill="#012169" d="M0 0h512v512H0z"/>
+  <path fill="#FFF" d="M512 0v64L322 256l190 187v69h-67L254 324 68 512H0v-68l186-187L0 74V0h62l192 188L440 0z"/>
+  <path fill="#C8102E" d="M184 324l11 34L42 512H0v-3l184-185zm124-12l54 8 150 147v45L308 312zM512 0L320 196l-4-44L466 0h46zM0 1l193 189-59-8L0 49V1z"/>
+  <path fill="#FFF" d="M176 0v512h160V0H176zM0 176v160h512V176H0z"/>
+  <path fill="#C8102E" d="M0 208v96h512v-96H0zM208 0v512h96V0h-96z"/>
+</svg>

static/img/svg/ru.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="flag-icon-css-ru" viewBox="0 0 512 512">
+  <g fill-rule="evenodd" stroke-width="1pt">
+    <path fill="#fff" d="M0 0h512v512H0z"/>
+    <path fill="#0039a6" d="M0 170.7h512V512H0z"/>
+    <path fill="#d52b1e" d="M0 341.3h512V512H0z"/>
+  </g>
+</svg>

static/js/global_js.js

@@ -49,14 +49,16 @@ function getInfoAboutUser (){
 document.addEventListener('DOMContentLoaded', function() {
      let img = document.getElementById('dropbtn_lang')
      if (window.location.href.indexOf("ru") > -1){
-        img.style.background = "url('/static/img/png/ru.png')"
+        img.style.background = "url('/static/img/svg/ru.svg')"
         img.style.backgroundRepeat = "no-repeat"
-        img.style.backgroundPosition = "left center"
+        img.style.backgroundPosition = "center"
+         // img.style.backgroundSize = '50%'
 
      }else if(window.location.href.indexOf("en") > -1){
-        img.style.background = "url('/static/img/png/en.png')"
+        img.style.background = "url('/static/img/svg/gb.svg')"
         img.style.backgroundRepeat = "no-repeat"
-        img.style.backgroundPosition = "left center"
+        img.style.backgroundPosition = "center"
+        // img.style.backgroundSize = '50%'
      }
 });
 

static/js/user_profile.js

@@ -351,6 +351,10 @@ function selectItemAddrPoint(id, name, ctrl_name,){
             tap_txt_cont.setAttribute('title',name)
             let tap_cont = document.querySelector("#id_" + ctrl_name.slice(0, -4));
             tap_cont.value = id;
+            if (tap_txt_cont.classList.contains('red_text')){
+                 tap_txt_cont.classList.remove('red_text')
+            }
+
             if (!window.location.href.includes("profile")){
                 changeWidthEL(tap_txt_cont)
             }
@@ -413,17 +417,16 @@ function onblurInputField(event,el){
 
 function clearID(el) {
 
-
     el.select();
 
-    if(el.id === 'id_from_address_point_txt'){
+    if(el.value !== "" && el.id === 'id_from_address_point_txt' ){
         document.getElementById('id_from_address_point').value = ''
-    } else if(el.id === 'id_to_address_point_txt'){
+        el.classList.add('red_text')
+    } else if(el.value !== "" && el.id === 'id_to_address_point_txt'){
         document.getElementById('id_to_address_point').value = ''
+        el.classList.add('red_text')
     }
 
-
-
 }
 
 

templates/tb_base.html

@@ -5,7 +5,8 @@
 <html lang="{{ request.LANGUAGE_CODE }}">
 <head>
     <meta charset="UTF-8">
-    <meta name="viewport" content="width=100%,maximum-scale=5,minimum-scale=1,initial-scale=1">
+{#    <meta name="viewport" content="width=100%,maximum-scale=5,minimum-scale=1,initial-scale=1">#}
+    <meta name="viewport" content="width=100%,maximum-scale=1,minimum-scale=1,initial-scale=1">
 
     {% include "inter/meta_names.html" %}
 {#    <script src='{% static "js/jquery_v3_6_4.js" %}'> </script>#}