sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SDE
2024-06-15 17:15:05 +03:00
parent d2754db97a 568906b2df
commit b2cb5463ef
6 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
locale/en/LC_MESSAGES/django.po
View File

@@ -1831,9 +1831,9 @@ msgid "стран"
msgstr "countries" msgstr "countries"
#: templates/pages/p_main.html:231 #: templates/pages/p_main.html:231
msgid "С TWB отправляй посылки по всему миру! С нами нет границ!" msgid "С TripWB отправляй посылки по всему миру! С нами нет границ!"
msgstr "" 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 #: templates/pages/p_main.html:247
msgid "Частые вопросы" msgid "Частые вопросы"

2
static/css/styles(boris).css
View File

@@ -1313,7 +1313,7 @@
} }
.from-to-country-container-carrier{ .from-to-country-container-carrier{
width: calc(100% - 70px); width: calc(100% - 60px);
margin: auto; margin: auto;
background: #F8F8F8; background: #F8F8F8;
box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20); box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);

5
static/css/styles.css
View File

@@ -770,6 +770,11 @@ button#send_upgrade:hover {
} }
button#webpush-subscribe-button {
color: white;
text-decoration: underline;
}
.header-second-item, .header-second-item,
.cont_header_btn_profile, .cont_header_btn_profile,

6
static/js/user_profile.js
View File

@@ -675,7 +675,7 @@ function confirmUpgrade(el, routeID){
let editButton = document.getElementById('edit_route_' + 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'); el_route.classList.add('highlight-color');
editButton.classList.add('highlight-color') editButton.classList.add('highlight-color')
document.getElementById('control_frame_' + routeID).classList.remove('show') document.getElementById('control_frame_' + routeID).classList.remove('show')
@@ -683,11 +683,11 @@ function confirmUpgrade(el, routeID){
for (let i = 0; i < remainsRisingCount.length; i++){ 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++){ 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;
} }

2
templates/blocks/b_footer.html
View File

@@ -69,7 +69,7 @@
</div> </div>
<div class="clear-both"></div> <div class="clear_both"></div>
<div style="text-align: left; color: #FFF !important;">{% webpush_button %}</div> <div style="text-align: left; color: #FFF !important;">{% webpush_button %}</div>
</div> </div>

2
templates/pages/p_main.html
View File

@@ -226,7 +226,7 @@
<div class="cards_item_text"> <div class="cards_item_text">
<div class="card_title_1">{% translate "30+" %}</div> <div class="card_title_1">{% translate "30+" %}</div>
<div class="card_title_2">{% translate "стран" %}</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> </div>