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:
SBD
2023-11-24 16:08:18 +03:00
parent 77de950af8 176c84cf2d
commit 31857131be
8 changed files with 85 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/css/mobile_styles.css
View File

@@ -112,6 +112,10 @@
margin-right: 20px;
}
.title_page{
font-size: 34px;
}
.wrapper_content {
margin: 20px;
@@ -1167,7 +1171,7 @@
height: unset;
margin: 20px auto;
padding: 10px;
justify-content: space-evenly;
justify-content: space-between;
}
.text_another_subscribe{
@@ -1177,7 +1181,7 @@
line-height: 20px;
}
.padding-n-width-another-subscribes{
padding-bottom: 10px;
/*padding-bottom: 10px;*/
padding-right: unset;
width: unset;
}
@@ -1255,8 +1259,12 @@
}
@media (max-width: 850px){
.read_more_about_subscribe{
padding: 0 14px;
height: 30px;
font-size: 14px;
}
.subscribe_inf_right_part, .subscribe_inf_left_part{
@@ -1265,6 +1273,8 @@
margin: 10px auto;
}
.subscribe_inf{
height: unset;
}
@@ -1414,7 +1424,7 @@
.another_subscribe{
padding: 10px;
flex-direction: unset;
justify-content: space-evenly;
justify-content: space-between;
}
.inf_carrier_icon{
/*width: 3%;*/
@@ -1685,6 +1695,8 @@
}

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

@@ -12,6 +12,7 @@
}
.text-align-center{
text-align: -moz-center;
text-align: -webkit-center;
width: 100%;
@@ -237,7 +238,7 @@
height: 62px;
width: 100%;
filter: drop-shadow(-1px 4px 10px rgba(198, 199, 203, 0.20)) drop-shadow(0px -1px 10px rgba(198, 199, 203, 0.20));
border-radius: 3px;
border-radius: 15px;
margin-bottom: 5px;
padding: 20px;
}
@@ -259,7 +260,7 @@
width: calc(100% - 40px);
height: 20px;
filter: drop-shadow(-1px 4px 10px rgba(198, 199, 203, 0.20)) drop-shadow(0px -1px 10px rgba(198, 199, 203, 0.20));
border-radius: 3px;
border-radius: 15px;
margin-bottom: 5px;
/*min-width: unset;*/
/*max-width: unset;*/
@@ -282,8 +283,11 @@
/*max-width: calc(80% - 40px);*/
resize: none;
padding: 20px;
width: 85%;
width: calc(100% - 117px);
float: left;
border-radius: 15px 0 0 15px;
border: solid #E6E6E6;
border-width: 1px 0 1px 1px;
}
@@ -302,13 +306,17 @@
/*top: 39px;*/
/*left: 93%;*/
height: calc(100% - 20px);
width: calc(15% - 60px);
width: 55px;
padding-top: 20px;
padding-right: 20px;
min-height: 220px;
float: right;
background: #FFFFFF;
text-align: right;
border-radius: 0 15px 15px 0;
border: solid #E6E6E6;
border-width: 1px 1px 1px 0px;
/*display: inline-block;*/
}
@@ -327,6 +335,7 @@
color: #FFFFFF;
border-radius: 10px;
float: left;
font-size: 16px;
}
.attach-file-btn{
@@ -575,7 +584,7 @@
position: relative;
display: inline-block;
margin-bottom: 0;
bottom: 6px;
vertical-align: middle;
}
.attach-file-btn-message.loader{
top: 10px;
@@ -590,6 +599,8 @@
background-position: center;
background-repeat: no-repeat;
margin-left: 5px;
display: inline-block;
vertical-align: middle;
}
.loader_show_message.show{
@@ -1420,7 +1431,7 @@
}
.inf_carrier_icon{
width: 10%;
width: 25px;
}
.phones_carrier_span.active{
@@ -1580,7 +1591,7 @@
.container_subscribe{
width: 25%;
border-radius: 10px;
padding: 2%;
padding: 20px;
box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
margin-right: 2%;
margin-left: 2%;

41
static/css/styles.css
View File

@@ -653,8 +653,15 @@ header .header-second {
}
span.btn_profile_name {
display: block;
padding-top: 10px;
display: inline-block;
vertical-align: middle;
/*padding-top: 10px;*/
}
#placeholder1{
height: 50px;
display: inline-block;
vertical-align: middle;
}
.header-second-item>a{
@@ -1460,6 +1467,13 @@ form.new_route>div{
/*display: block ruby;*/
}
.type_transportation_carrier>.inf_carrier_icon{
width: 14px;
vertical-align: baseline;
}
form.new_route>div.range-slider{
margin-bottom: 30px;
margin-top: 30px;
@@ -1548,7 +1562,9 @@ form.new_route{
}
form.new_route>.button_register>#registration{
width: 100%;
}
div.departure_arrival>div>input{
@@ -1556,7 +1572,7 @@ div.departure_arrival>div>input{
border-radius: 15px;
border: 1px solid #E6E6E6;
color: #272424;
font-family: Inter;
font-size: 16px;
font-style: normal;
font-weight: 400;
@@ -1567,6 +1583,9 @@ div.departure_arrival>div>input{
padding-left: 10px;
padding-right: 10px;
margin-top: 10px;
background: url(/static/img/svg/Calendar.svg) white 50%;
background-repeat: no-repeat;
background-position: right 2% bottom 45%;
@@ -1844,10 +1863,15 @@ input#id_extra_phone
}
.route_info_about>span:last-child{
background: url("/static/img/png/Airplane.png") left center no-repeat;
float: right;
margin-right: 20px;
padding-left: 15px;
/*background: url("/static/img/png/Airplane.png") left center no-repeat;*/
/*float: right;*/
/*margin-right: 20px;*/
/*padding-left: 15px;*/
}
.route_info_about>span>.inf_carrier_icon{
width: 12px;
vertical-align: baseline;
}
.route_contact{
@@ -1882,6 +1906,7 @@ button#edit_route {
button#remove_route {
height: 44px;
width: 285px;
color: rgba(39, 36, 36, 0.60);
}
button.confirm_remove{
width: 49.5%;

1
templates/blocks/b_header.html
View File

@@ -68,6 +68,7 @@
<span class="btn_profile_name">
{{ user.first_name }} {{ user.last_name }}
</span>
<span id="placeholder1"></span>
<div class="icon_unread_messages" style="padding-top: 2px;padding-right: 13px;">
<div class="cost-messages-in-user-tab-messenger" style="background: #FFFFFF;">
<span class="unredmessages_value_text" style="padding-top: 2px;padding-left: 0; color: #000000;"></span>

10
templates/blocks/profile/b_new_route.html
View File

@@ -75,7 +75,7 @@
{# {% if form.initial.departure_DT %}value="{{ form.initial.departure_DT.date|date:"Y-m-d" }}T{{ form.initial.departure_DT.time|date:"H:i" }}"{% endif %}#}
{# />#}
{# boris change input #}
<input class="el_form_b_new_route" type="text" id="id_departure_DT" name="departure_DT" placeholder="" {% if form.initial.departure_DT %} value="{{ form.initial.departure_DT|date:"y.m.d H:m" }}"{% endif %}/>
<input class="el_form_b_new_route" type="text" id="id_departure_DT" name="departure_DT" placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.departure_DT %} value="{{ form.initial.departure_DT|date:"y.m.d H:m" }}"{% endif %}/>
<div id="displayRegervation"></div>
{% if not errors_off and form.errors and form.errors.departure_DT %}
@@ -96,7 +96,7 @@
{# {% if form.initial.arrival_DT %}value="{{ form.initial.arrival_DT.date|date:"Y-m-d" }}T{{ form.initial.arrival_DT.time|date:"H:i" }}"{% endif %}#}
{# />#}
{# boris change input #}
<input class="el_form_b_new_route" type="text" id="id_arrival_DT" name="arrival_DT" placeholder="" {% if form.initial.arrival_DT %} value="{{ form.initial.arrival_DT|date:"y.m.d H:m" }}"{% endif %}/>
<input class="el_form_b_new_route" type="text" id="id_arrival_DT" name="arrival_DT" placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.arrival_DT %} value="{{ form.initial.arrival_DT|date:"y.m.d H:m" }}"{% endif %}/>
<div id="displayRegervation"></div>
{# end #}
@@ -146,7 +146,7 @@
type="number"
name="from_address_point"
id="id_from_address_point"
class="el_form_find_route"
class="el_form_b_new_route el_form_find_route"
hidden
class="disp-none"
{% if route_form.initial.from_address_point %}value="{{ route_form.initial.from_address_point}}"{% endif %}/>
@@ -203,7 +203,7 @@
type="number"
name="to_address_point"
id="id_to_address_point"
class="el_form_find_route"
class="el_form_b_new_route el_form_find_route"
hidden
class="disp-none"
{% if route_form.initial.to_address_point %}value="{{ route_form.initial.to_address_point}}"{% endif %}/>
@@ -407,7 +407,7 @@
<div>
<input type="checkbox" name="receive_msg_by_email" class="custom-checkbox" id="id_receive_msg_by_email">
<label for="id_receive_msg_by_email">s
<label for="id_receive_msg_by_email">
<div class="receive_msg_by_email">{{ form.fields.receive_msg_by_email.label }}</div>
<img id="img_msg_by_email"

2
templates/forms/f_find_route_filters_form.html
View File

@@ -36,7 +36,7 @@
<input class="input_f_checkbox_type_transport el_form_find_route" type="checkbox" value="{{ item.0 }}" name="type_transport" id="id_cargo_type_car_{{ forloop.counter }}" onchange="filters_func_find_route_main(this,'{{ owner_type }}')">
<label for="id_cargo_type_car_{{ forloop.counter }}" class="label_f_checkbox_type_transport">
<div class="trigger_f_type_transport"></div>
<img class="img_f_checkbox_type_transport" src="{% static "img/svg/Car.svg" %}">
<img class="img_f_checkbox_type_transport" {% if forloop.counter|divisibleby:2 %}src="{% static "img/svg/Airplane.svg" %}" {% else %}src="{% static "img/svg/Car.svg" %}"{% endif %} >
<span class="span_f_checkbox_type_transport">{{ item.1 }}</span>
</label>
</div>

6
templates/widgets/w_carrier_card.html
View File

@@ -6,7 +6,13 @@
<div class="carrier-title">
{% translate "Перевозчик:" %}
</div>
<div class="type_transportation_carrier">
{% if route.type_transport == 'road' %}
<img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>
{% elif route.type_transport == 'avia'%}
<img class="inf_carrier_icon" src="{% static "/img/svg/Airplane.svg" %}"/>
{% endif %}
{{ route.get_type_transport_display }}
</div>
<div class="clear_both"></div>

6
templates/widgets/w_route_info.html
View File

@@ -26,6 +26,12 @@
<span>
{% if route.type_transport == 'road' %}
<img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>
{% elif route.type_transport == 'avia'%}
<img class="inf_carrier_icon" src="{% static "/img/svg/Airplane.svg" %}"/>
{% endif %}
{{ route.get_type_transport_display }}
</span>