From b8aba1d951f748d8aea23395e563e26ae19bcf04 Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Wed, 12 Jun 2024 15:38:28 +0300
Subject: [PATCH 1/4] 1.1.9 fix width for container-carrier

---
 static/css/styles(boris).css | 2 +-
 static/js/user_profile.js    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css
index 42a8d4a..9f6bdb8 100644
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -1313,7 +1313,7 @@
 }
 
 .from-to-country-container-carrier{
-    width: calc(100% - 70px);
+    width: calc(100% - 60px);
     margin: auto;
     background: #F8F8F8;
     box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
diff --git a/static/js/user_profile.js b/static/js/user_profile.js
index 0d84835..c7b6747 100644
--- a/static/js/user_profile.js
+++ b/static/js/user_profile.js
@@ -675,7 +675,7 @@ function confirmUpgrade(el, routeID){
 
             let editButton = document.getElementById('edit_route_' + routeID)
 
-            if(url === '/routes/highlight_route/' && !remainsHighlightCount[0].innerText === '0'){
+            if(url === '/routes/highlight_route/'){
                         el_route.classList.add('highlight-color');
                         editButton.classList.add('highlight-color')
                         document.getElementById('control_frame_' + routeID).classList.remove('show')
@@ -683,11 +683,11 @@ function confirmUpgrade(el, routeID){
 
 
              for (let i = 0; i < remainsRisingCount.length; i++){
-                remainsRisingCount[i].innerText = data.remains_route_rising_count.toString();
+                remainsRisingCount[i].innerText = data.remains_route_rising_count;
             }
 
             for (let i = 0; i < remainsHighlightCount.length; i++){
-                remainsHighlightCount[i].innerText = data.remains_route_highlight_count.toString();
+                remainsHighlightCount[i].innerText = data.remains_route_highlight_count;
             }
 
 

From 03ecd45316ec51b496b91309f4ed6d18bc119f4f Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Wed, 12 Jun 2024 22:45:36 +0300
Subject: [PATCH 2/4] 1.1.9 fix webpush button footer

---
 templates/blocks/b_footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html
index f878b7f..aeff61e 100644
--- a/templates/blocks/b_footer.html
+++ b/templates/blocks/b_footer.html
@@ -69,7 +69,7 @@
 
 
         </div>
-        <div class="clear-both"></div>
+        <div class="clear_both"></div>
         <div style="text-align: left; color: #FFF !important;">{% webpush_button %}</div>
     </div>
 

From fbae55365712337e2904d23ac116dde674b913ce Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Wed, 12 Jun 2024 23:33:24 +0300
Subject: [PATCH 3/4] 1.1.10 fix webpush button footer

---
 static/css/styles.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/static/css/styles.css b/static/css/styles.css
index 09ddb66..1b442ae 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -770,6 +770,11 @@ button#send_upgrade:hover {
 
 }
 
+button#webpush-subscribe-button {
+    color: white;
+    text-decoration: underline;
+}
+
 
 .header-second-item,
 .cont_header_btn_profile,

From 568906b2dfae704287425fb2f7627b2564cd8560 Mon Sep 17 00:00:00 2001
From: sysadminix <sa@a3-global.com>
Date: Fri, 14 Jun 2024 09:32:27 +0300
Subject: [PATCH 4/4] 0.0.16 twb-tripwb replace

---
 locale/en/LC_MESSAGES/django.po | 4 ++--
 templates/pages/p_main.html     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index bc5fe7f..0a0bd9f 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -1831,9 +1831,9 @@ msgid "стран"
 msgstr "countries"
 
 #: templates/pages/p_main.html:231
-msgid "С TWB отправляй посылки по всему миру! С нами нет границ!"
+msgid "С TripWB отправляй посылки по всему миру! С нами нет границ!"
 msgstr ""
-"With TWB - send parcels all over the world! There are no boundaries with us!"
+"With TripWB - send parcels all over the world! There are no boundaries with us!"
 
 #: templates/pages/p_main.html:247
 msgid "Частые вопросы"
diff --git a/templates/pages/p_main.html b/templates/pages/p_main.html
index 293a220..2287096 100644
--- a/templates/pages/p_main.html
+++ b/templates/pages/p_main.html
@@ -226,7 +226,7 @@
                     <div class="cards_item_text">
                         <div class="card_title_1">{% translate "30+" %}</div>
                         <div class="card_title_2">{% translate "стран" %}</div>
-                        <div class="card_title_3">{% translate "С TWB отправляй посылки по всему миру! С нами нет границ!" %}</div>
+                        <div class="card_title_3">{% translate "С TripWB отправляй посылки по всему миру! С нами нет границ!" %}</div>
                     </div>