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

0.0.268 all child are replaced

Browse Source
This commit is contained in:
ArtemB
2023-11-29 19:44:20 +03:00
parent ebdc84f7e1
commit a7d9dfe79a
9 changed files with 138 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
static/css/mobile_styles.css
View File

@@ -390,16 +390,16 @@
/* footer*/
.first-column>div:first-child{
.footer_logo{
text-align: center;
margin: 40px 0;
}
.first-column>div:nth-child(2)>div:first-child{
.footer_text_sub{
text-align: center;
}
.first-column>div:nth-child(2)>div:last-child{
.footer_input_wrap{
justify-content: center;
}
@@ -444,7 +444,7 @@
margin-bottom: 60px;
}
.four-column>div:last-child>div{
.footer_text_contact>div{
margin-bottom: 10px;
}
@@ -496,7 +496,7 @@
margin-bottom: 10px;
}
.inputs>div:first-child{
.inp_firstname{
margin: unset;
width: unset;
margin-bottom: 10px;
@@ -507,7 +507,7 @@
width: 100%;
}
.agree>div:last-child{
.agree_text{
font-size: 12px;
font-style: normal;
font-weight: 400;
@@ -939,11 +939,7 @@
padding-top: 1px;
margin-bottom: 40px;
}
/*.news_item_pagination:nth-child(odd) .pag_news_img, .news_item_pagination:nth-child(odd) .pag_news_item_text,*/
/*.news_item_pagination:nth-child(even) .pag_news_img, .news_item_pagination:nth-child(even) .pag_news_item_text{*/
/* float: none;*/
/* width: unset;*/
/*}*/
.pag_news_item_text{
width: 70%;
}
@@ -965,11 +961,19 @@
width: 100%;
background: white;
}
.departure_arrival>div:first-child, .from_to_place>div:first-child, .from_to_country>div:first-child, .phone>div:first-child,
.departure_arrival>div:nth-child(2), .from_to_place>div:nth-child(2), .from_to_country>div:nth-child(2), .phone>div:nth-child(2){
/*.departure_arrival>div:first-child, .from_to_place>div:first-child, .from_to_country>div:first-child, .phone>div:first-child,*/
/*.departure_arrival>div:nth-child(2), .from_to_place>div:nth-child(2), .from_to_country>div:nth-child(2), .phone>div:nth-child(2){*/
/* width: unset;*/
/* float: none;*/
/*}*/
.wrap_left, .from_country_container, #arrival_div, .wrap_right, .phone_right{
width: unset;
float: none;
}
.js-input, input#id_phone, input#id_extra_phone{
width: calc(100% - 10px);
}
@@ -1005,15 +1009,15 @@
font-weight: 400;
line-height: 40px;
}
.route_info_about>span:first-child{
.cargo_type_disp{
margin: unset;
float: left;
}
.route_info_about>span:last-child{
.cargo_weight{
float: none;
margin: unset;
}
.route_info_about>span:nth-child(2){
.cargo_type_trans{
float: right;
}
@@ -1605,7 +1609,7 @@
display: inline-block;
}
.agree>div:last-child{
.agree_text{
margin-bottom: 10px;
}

190
static/css/styles.css
View File

@@ -382,7 +382,7 @@ footer>div {
display: inline-block;
}
.second-column>div:first-child {
.footer_text_inform {
color: #FFF;
/* Heading 4 */
font-size: 20px;
@@ -393,18 +393,6 @@ footer>div {
}
.four-column>div:first-child {
color: #FFF;
/* Heading 4 */
font-size: 20px;
font-style: normal;
font-weight: 500;
line-height: 28px;
margin-bottom: 40px;
}
.third-column>div>a{
color: white;
@@ -414,7 +402,7 @@ footer>div {
line-height: 22px;
}
.four-column>div:last-child {
.footer_text_contact {
color: #FFF;
/* Body text 2 */
font-size: 16px;
@@ -438,11 +426,11 @@ footer>div {
.second-column>div:last-child>div>div {
.footer_static_links>div {
margin-bottom: 8px;
}
.second-column>div:last-child>div>div>a {
.footer_static_links>div>a {
color: #FFF;
/* Body text 2 */
font-size: 16px;
@@ -467,7 +455,7 @@ footer>div {
text-align: center;
}
.fifth-column>a:first-child {
.fifth-column-first {
margin-bottom: 10px;
}
@@ -715,14 +703,14 @@ span.btn_profile_name {
/* width: 16px;*/
/*}*/
.dropdown-content-lang a:first-child
#ru_lang
{
background: url('/static/img/png/ru.png') no-repeat left center;
color: transparent;
padding: 10px;
}
.dropdown-content-lang a:last-child
#en_lang
{
background: url('/static/img/png/en.png') no-repeat left center;
color: transparent;
@@ -765,9 +753,9 @@ span.btn_profile_name {
header>div:last-child>div:nth-child(2)>.svg {
margin-right: 5px;
}
/*header>div:last-child>div:nth-child(2)>.svg {*/
/* margin-right: 5px;*/
/*}*/
@@ -810,9 +798,9 @@ section.register>form {
flex-basis: 50%;
}
.inputs>div:first-child {
.inp_firstname {
margin-right: 30px;
width: clamp(300px, 300px, 90%);
/*width: clamp(300px, 300px, 90%);*/
}
@@ -834,14 +822,13 @@ section.register>form {
align-items: end;
}
.agree>div:first-child {
.agree>.checkbox{
width: 50px;
}
.agree>div:last-child {
.agree_text {
color: rgba(39, 36, 36, 0.60);
/* Body text 3 */
font-family: Inter;
font-size: 14px;
font-style: normal;
font-weight: 400;
@@ -1071,11 +1058,10 @@ section.login>form {
padding-left: 10px;
}
section.login>form>div>div:nth-child(4) {
.agree_text_l {
color: rgba(39, 36, 36, 0.60);
text-align: center;
/* Body text 3 */
font-family: Inter;
font-size: 14px;
font-style: normal;
font-weight: 400;
@@ -1109,7 +1095,7 @@ section.login>form>div>div:nth-child(4) {
margin-bottom: 20px;
}
section.login>form>div>div:nth-child(7) {
#google_text {
color: rgba(39, 36, 36, 0.60);
/* Body text 1 */
font-family: Inter;
@@ -1119,10 +1105,11 @@ section.login>form>div>div:nth-child(7) {
line-height: 22px;
}
section.login>form>div>div:nth-child(5)>a {
.call_to_reg>a {
text-decoration: underline;
color: rgba(39, 36, 36, 0.60);
}section.login>form>div>div:nth-child(5) {
}
.call_to_reg {
color: rgba(39, 36, 36, 0.60);
font-style: normal;
@@ -1266,19 +1253,18 @@ h2.title_new_route{
.info_profile>h1 {
color: #272424;
font-family: Inter;
font-size: 24px;
font-style: normal;
font-weight: 700;
line-height: 36px;
}
.info_profile>h1>span:first-child {
.user_first_name {
color: #FF613A;
text-decoration: underline;
}
.info_profile>h1>span:last-child {
.user_username {
color: #27242499;
font-size: 20px;
}
@@ -1301,7 +1287,7 @@ h2.title_new_route{
margin-bottom: 40px;
}
.info_profile>div:nth-child(3) {
.prof_first_line {
color: #272424;
font-family: Inter;
font-size: 16px;
@@ -1312,7 +1298,7 @@ h2.title_new_route{
line-height: 22px;
}
.info_profile>div:nth-child(4) {
.prof_second_line {
color: #272424;
font-family: Inter;
font-size: 16px;
@@ -1322,7 +1308,7 @@ h2.title_new_route{
margin-bottom: 40px;
}
.info_profile>div:nth-child(5) {
.prof_third_line {
color: #272424;
font-family: Inter;
font-size: 16px;
@@ -1331,15 +1317,15 @@ h2.title_new_route{
line-height: 22px;
}
.info_profile>div:nth-child(3)>a {
.prof_first_line>a {
color: #FF613A;
}
.info_profile>div:nth-child(4)>a {
.prof_second_line>a {
color: #FF613A;
}
.info_profile>div:nth-child(5)>a {
.prof_third_line>a {
color: #FF613A;
}
@@ -1348,15 +1334,15 @@ h2.title_new_route{
border-radius: 10px;
}
.profile_prof>div>div:first-child {
color: #272424;
/* Heading 5 */
font-family: Inter;
font-size: 18px;
font-style: normal;
font-weight: 600;
line-height: 26px;
}
/*.profile_prof>div>div:first-child {*/
/* color: #272424;*/
/* !* Heading 5 *!*/
/* font-family: Inter;*/
/* font-size: 18px;*/
/* font-style: normal;*/
/* font-weight: 600;*/
/* line-height: 26px;*/
/*}*/
.custom_select {
display: block;
@@ -1489,10 +1475,8 @@ form.new_route{
}
.departure_arrival>div:first-child,
.from_to_place>div:first-child,
.from_to_country>div:first-child,
.phone>div:first-child
.wrap_left,
.from_country_container
{
width: 50%;
float: left;
@@ -1500,17 +1484,15 @@ form.new_route{
}
.departure_arrival>div:nth-child(2),
.from_to_place>div:nth-child(2),
.from_to_country>div:nth-child(2)
#arrival_div,
.wrap_right
{
width: 50%;
float: right;
margin-bottom: 20px;
}
.phone>div:nth-child(2){
.phone_right{
width: 49%;
float: right;
margin-bottom: 20px;
@@ -1640,9 +1622,6 @@ div.departure_arrival>div>input{
padding: 12px 15px;
border-bottom: solid 1px #eee;
cursor: pointer;
}
.autocomplete-result:last-child {
border-bottom-width: 0;
}
@@ -1652,12 +1631,12 @@ div.departure_arrival>div>input{
}
.autocomplete-results[data-highlight='#{$i}'] > :nth-child(#{$iPlus}) {
color: white;
background: #26C9FF;
border-bottom-color: #26C9FF;
outline: solid 1px #26C9FF;
}
/*.autocomplete-results[data-highlight='#{$i}'] > :nth-child(#{$iPlus}) {*/
/* color: white;*/
/* background: #26C9FF;*/
/* border-bottom-color: #26C9FF;*/
/* outline: solid 1px #26C9FF;*/
/*}*/
/*autocomplete-wrapper END*/
.input_list{
@@ -1751,21 +1730,7 @@ input#id_extra_phone
}
/*.checkbox_cargo_type>div:nth-child(1){*/
/* flex-shrink: 1;*/
/*}*/
/*.checkbox_cargo_type>div:nth-child(2){*/
/* flex-shrink: 1;*/
/*}*/
/*.checkbox_cargo_type>div:nth-child(3){*/
/* flex-shrink: 1;*/
/*}*/
/*.checkbox_cargo_type>div:nth-child(4){*/
/* flex-shrink: 1;*/
/*}*/
/*.checkbox_cargo_type>div:nth-child(5){*/
/* flex-shrink: 1;*/
/*}*/
@@ -1857,23 +1822,18 @@ input#id_extra_phone
.route_info_about>span:first-child{
.cargo_type_disp{
background: url("/static/img/png/Tag.png") left center no-repeat;
margin: 0 20px 0 20px;
padding-left: 15px;
}
.route_info_about>span:nth-child(2){
.cargo_weight{
background: url("/static/img/png/Scales.png") left center no-repeat;
padding-left: 20px;
}
.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;*/
}
.route_info_about>span>.inf_carrier_icon{
width: 12px;
@@ -2056,35 +2016,35 @@ button#more_button{
}
.top_block_static img:nth-child(4) {
/* Положение нижнего левого изображения */
left: 129px;
bottom: -26px;
/*.top_block_static img:nth-child(4) {*/
/* !* Положение нижнего левого изображения *!*/
/* left: 129px;*/
/* bottom: -26px;*/
}
/*}*/
.top_block_static img:nth-child(5) {
/* Положение верхнего левого изображения */
top: 4px;
left: 1%;
/*.top_block_static img:nth-child(5) {*/
/* !* Положение верхнего левого изображения *!*/
/* top: 4px;*/
/* left: 1%;*/
}
/*}*/
.top_block_static img:nth-child(6) {
/* Положение нижнего правого изображения */
bottom: -33px;
right: 126px;
top: 58px;
/*.top_block_static img:nth-child(6) {*/
/* !* Положение нижнего правого изображения *!*/
/* bottom: -33px;*/
/* right: 126px;*/
/* top: 58px;*/
}
/*}*/
.top_block_static img:nth-child(7) {
top: 0; /* Положение верхнего правого изображения */
right: 0;
/*.top_block_static img:nth-child(7) {*/
/* top: 0; !* Положение верхнего правого изображения *!*/
/* right: 0;*/
}
/*}*/
.mid_block_static{
@@ -2199,14 +2159,14 @@ figure{
width: 30%;
}
.bottom_block_static img:nth-child(4) {
.bottom_block_static>#box1 {
/* Положение нижнего левого изображения */
left: -10%;
bottom: -7%;
}
.bottom_block_static img:nth-child(5) {
.bottom_block_static>#box2 {
/* Положение верхнего левого изображения */
top: 16%;
left: -2%;
@@ -2215,7 +2175,7 @@ figure{
}
.bottom_block_static img:nth-child(6) {
.bottom_block_static>#box3 {
/* Положение нижнего правого изображения */
right: -10%;
bottom: -4%;
@@ -2224,7 +2184,7 @@ figure{
.bottom_block_static img:nth-child(7) {
.bottom_block_static>#box4 {
/* Положение верхнего правого изображения */
top: 18%;
right: -1%;

24
templates/blocks/b_footer.html
View File

@@ -18,16 +18,16 @@
</div>
</div>
<div class="second-column">
<div>{% trans "Информация" %}</div>
<div>
<div>
<div><a href="{% url 'profile_page' 'create_route_for_mover' %}">{% trans "Перевезти посылку" %}</a></div>
<div><a href="{% url 'profile_page' 'create_route_for_customer' %}">{% trans "Отправить посылку" %}</a></div>
<div><a href="{% url 'static_page' 'for_customers' %}">{% trans "Для отправителя" %}</a></div>
<div><a href="{% url 'static_page' 'for_movers' %}">{% trans "Для перевозчика" %}</a></div>
</div>
<div class="footer_text_inform">{% trans "Информация" %}</div>
<div>
<div class="footer_static_links">
<div><a href="{% url 'profile_page' 'create_route_for_mover' %}">{% trans "Перевезти посылку" %}</a></div>
<div><a href="{% url 'profile_page' 'create_route_for_customer' %}">{% trans "Отправить посылку" %}</a></div>
<div><a href="{% url 'static_page' 'for_customers' %}">{% trans "Для отправителя" %}</a></div>
<div><a href="{% url 'static_page' 'for_movers' %}">{% trans "Для перевозчика" %}</a></div>
</div>
</div>
</div>
</div>
</div>
<div class="right-column">
@@ -41,8 +41,8 @@
</div>
<div class="four-column">
<div>{% trans "Свяжитесь с нами:" %}</div>
<div>
<div class="footer_text_inform">{% trans "Свяжитесь с нами:" %}</div>
<div class="footer_text_contact">
<div>
<a href="tel:+77777777777">+ 7 (777) 777-77-77</a>
</div>
@@ -57,7 +57,7 @@
{% if not user.is_authenticated %}
<div class="fifth-column">
<a href="{% url "registration_page" %}">{% trans "Регистрация" %}</a>
<a class="fifth-column-first" href="{% url "registration_page" %}">{% trans "Регистрация" %}</a>
<a href="{% url "login_profile" %}">{% trans "Войти" %}</a>
</div>
{% endif %}

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

@@ -59,7 +59,7 @@
{% if form.initial and form.initial.type_transport and form.initial.type_transport != '' %}
<hr>
<div class="departure_arrival">
<div>
<div class="wrap_left">
<label for="id_departure_DT">{{ form.fields.departure_DT.label }}</label>
@@ -83,7 +83,7 @@
{% endif %}
</div>
<div id="arrival_div">
<div id="arrival_div">
<label for="id_arrival_DT">{{ form.fields.arrival_DT.label }}</label>
{# <input#}
{# type="datetime-local"#}
@@ -144,7 +144,7 @@
<span>{{ form.errors.from_address_point}}</span>
{% endif %}
</div>
<div>
<div class="wrap_right">
<label for="id_to_address_point_txt">{{ form.fields.to_address_point.label }}</label>
<input
type="number"
@@ -188,7 +188,7 @@
{# <input type="text" name="to_city"{% if form.fields.to_city.required %} required{% endif %} id="id_to_city">#}
{# </div>#}
<div class="from_to_place">
<div>
<div class="wrap_left">
<label for="id_from_place">{{ form.fields.from_place.label }}</label>
<select
class="custom_select el_form_b_new_route"
@@ -207,7 +207,7 @@
<span>{{ form.errors.from_place }}</span>
{% endif %}
</div>
<div>
<div class="wrap_right">
<label for="id_to_place">{{ form.fields.to_place.label }}</label>
<select
name="to_place"
@@ -309,7 +309,7 @@
<hr>
<div class="phone">
<div>
<div class="wrap_left">
<label for="id_phone">{{ form.fields.phone.label }}</label>
<input
type="phone"
@@ -329,7 +329,7 @@
{% endif %}
</div>
<div>
<div class="phone_right">
<label for="id_extra_phone">{{ form.fields.extra_phone.label }}</label>
<input

8
templates/blocks/profile/b_profile_first_page.html
View File

@@ -1,7 +1,7 @@
{% load static %}
{% load i18n %}
<h1>{% translate "Добро пожаловать:" %} <span>{{ user.first_name }} {{ user.last_name }}</span> <span>({{ user.username }})</span></h1>
<h1>{% translate "Добро пожаловать:" %} <span class="user_first_name">{{ user.first_name }} {{ user.last_name }}</span> <span class="user_username" >({{ user.username }})</span></h1>
<div class="profile_prof"><img class="avatar_user_profile" {% if user.user_profile.avatar %}
src="{{ user.user_profile.avatar.url }}"
{% else %}src="{% static "img/svg/User.svg" %}"{% endif %} alt="">
@@ -20,6 +20,6 @@
</div>
</div>
{# <div class="advice_text">{% translate "Если хотите отправить посылку - зарегистрируйтесь, как отправитель" %}</div>#}
<div>{% translate "Если у Вас возникнут вопросы Вы можете связаться с нами:" %} <a href="mailto:support@twb.com">support@twb.com</a></div>
{# <div>{% translate "У Вас" %} <a href="#">{% translate "три " %}</a>{% translate "новых сообщения." %} <a href="#">{% translate "Посмотреть" %}</a></div>#}
<div>{% translate "Хотите получать уведомление о появлении посылок?" %} <a href="#">{% translate "Заполните форму" %}</a></div>
<div class="prof_first_line">{% translate "Если у Вас возникнут вопросы Вы можете связаться с нами:" %} <a href="mailto:support@twb.com">support@twb.com</a></div>
{# <div class="prof_second_line">{% translate "У Вас" %} <a href="#">{% translate "три " %}</a>{% translate "новых сообщения." %} <a href="#">{% translate "Посмотреть" %}</a></div>#}
<div class="prof_third_line">{% translate "Хотите получать уведомление о появлении посылок?" %} <a href="#">{% translate "Заполните форму" %}</a></div>

8
templates/blocks/static_pages_blocks/b_mover_search.html
View File

@@ -184,10 +184,10 @@
<button id="more_button">{% translate "Получить" %}</button>
</div>
<img src="/static/img/png/Box5.png" alt="">
<img src="/static/img/png/Box4.png" alt="">
<img src="/static/img/png/Box4.png" alt="">
<img src="/static/img/png/Box6.png" alt="">
<img id="box1" src="/static/img/png/Box5.png" alt="">
<img id="box2" src="/static/img/png/Box4.png" alt="">
<img id="box3" src="/static/img/png/Box4.png" alt="">
<img id="box4" src="/static/img/png/Box6.png" alt="">
</div>

6
templates/forms/f_login.html
View File

@@ -28,12 +28,12 @@
{% endif %}
</div>
<div class="button_register"><button onclick="SendLoginForm(this)">{% translate "Войти" %}</button></div>
<div>{% translate "Авторизуясь, вы соглашаетесь с Лицензионным соглашением Политикой конфиденциальности" %}</div>
<div class="agree_text_l">{% translate "Авторизуясь, вы соглашаетесь с Лицензионным соглашением Политикой конфиденциальности" %}</div>
{# <div>Или</div>#}
{# <div class="google"><img src="/static/img/png/google.png" alt="">#}
{# <div id = "google_text" class="google"><img src="/static/img/png/google.png" alt="">#}
{# <div>Войти через Google</div>#}
{# </div>#}
<div>{% translate "Нет аккаунта?" %} <a href="/ru/profile/registration/">{% translate "Зарегистрируйтесь" %}</a></div>
<div class="call_to_reg">{% translate "Нет аккаунта?" %} <a href="/ru/profile/registration/">{% translate "Зарегистрируйтесь" %}</a></div>
</div>
</form>
</section>

18
templates/forms/f_registration.html
View File

@@ -12,14 +12,13 @@
<form name="registration_form" method="POST">
{% csrf_token %}
{#
<div class="inputs">
<div><input name="firstname" type="text" placeholder="{{ p_name }}"{% if form.data.firstname %} value="{{ form.data.firstname }}"{% endif %}>
<div class="inp_firstname">
<input name="firstname" type="text" placeholder="{{ p_name }}"{% if form.data.firstname %} value="{{ form.data.firstname }}"{% endif %}>
{% if form.errors and form.errors.firstname %}
<span>{{ form.errors.firstname }}</span>
{% endif %}
{% endif %}
</div>
<div><input name="lastname" type="text" placeholder="{{ p_lastname }}"{% if form.data.lastname %} value="{{ form.data.lastname }}"{% endif %}>
{% if form.errors and form.errors.lastname %}
@@ -28,7 +27,7 @@
</div>
</div>
<div class="inputs">
<div><input name="email" type="text" placeholder="E-mail"{% if form.data.email %} value="{{ form.data.email }}"{% endif %}>
<div class="inp_firstname"><input name="email" type="text" placeholder="E-mail"{% if form.data.email %} value="{{ form.data.email }}"{% endif %}>
{% if form.errors and form.errors.email %}
<span>{{ form.errors.email }}</span>
{% endif %}
@@ -40,7 +39,7 @@
</div>
</div>
<div class="inputs">
<div><input name="password" type="password" placeholder="{{ p_password }}"{% if form.data.password %} value="{{ form.data.password }}"{% endif %}>
<div class="inp_firstname"><input name="password" type="password" placeholder="{{ p_password }}"{% if form.data.password %} value="{{ form.data.password }}"{% endif %}>
{% if form.errors and form.errors.password %}
<span>{{ form.errors.password }}</span>
{% endif %}
@@ -51,15 +50,16 @@
{% endif %}
</div>
</div>
<div class="agree"><div class="checkbox">
<div class="agree">
<div class="checkbox">
<input class="custom-checkbox" type="checkbox" id="agreement" name="agreement" value="true" {% if form.data.agreement %} value="{{ form.data.agreement}}"{% endif %}>
<label for="agreement"></label>
</div>
</div>
{% if form.errors and form.errors.agreement %}
<span>{{ form.errors.agreement }}</span>
{% endif %}
<div>{% translate "Регистрируясь, я соглашаюсь с Лицензионным соглашениеми и Политикой конфиденциальности" %}</div>
<div class="agree_text">{% translate "Регистрируясь, я соглашаюсь с Лицензионным соглашениеми и Политикой конфиденциальности" %}</div>
</div>
<div class="button_register">
<button id="registration" onclick="SendRegistrationForm(this)"> {% translate "Зарегистрироваться" %} </button>

6
templates/widgets/w_route_info.html
View File

@@ -16,15 +16,15 @@
{# <div class="clear_both"></div>#}
{# </div>#}
<div class="route_info_about">
<span>
<span class="cargo_type_disp">
{% translate "Тип:" %}{{ route.get_cargo_type_display }}
</span>
<span>
<span class="cargo_weight">
{% translate "Вес:" %}{{ route.weight }} {% translate "кг" %}
</span>
<span>
<span class="cargo_type_trans">
{% if route.type_transport == 'road' %}
<img class="inf_carrier_icon" src="{% static "/img/svg/Car.svg" %}"/>