From 2c00a38ceb652c9c9b43810e701d62b4554c1390 Mon Sep 17 00:00:00 2001 From: SBD Date: Tue, 21 Jan 2025 16:48:19 +0300 Subject: [PATCH] 0.0.51 w route card --- static/v2/css/widgets/w_route_card.css | 24 +++++++++++++++++-- .../v2/widgets/w_customer_route_card.html | 24 +++++++++---------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/static/v2/css/widgets/w_route_card.css b/static/v2/css/widgets/w_route_card.css index 71ebe75..562194a 100644 --- a/static/v2/css/widgets/w_route_card.css +++ b/static/v2/css/widgets/w_route_card.css @@ -39,12 +39,16 @@ --route-btn-hover-text-color: #FFFFFF; --route-btn-title-color: #272424; --route-btn-text-data-color: #27242499; + --route-btn-margin: 0; --route-date-data-justify: center; --route-date-data-margin: 4px 0 0 0; --card-splitter-bg: #E6E6E6; + --route-number-font-size: 12px; + --route-number-margin-top: 5px; + background: var(--route-card-bg); margin: var(--route-card-margin); box-shadow: var(--route-card-box_shadow); @@ -166,7 +170,10 @@ } &.route_date_data{ margin-top: 0; - margin-bottom: 39px; + margin-bottom: 5px; + &:last-of-type{ + margin-bottom: 39px; + } } justify-content: left!important; } @@ -181,6 +188,7 @@ } &:has(.departure_from){ .place{justify-content: left} } + @media (max-width: 1160px) {.place{justify-content: left!important;}} .label{ color: #27242499; font-size: var(--big-font-size); @@ -312,7 +320,7 @@ .route_btn{ @media (max-width: 1160px) { &.phone{display: none;}; - &.mobile{display: block;} + &.mobile{display: flex!important;} } &.mobile{display: none;} @@ -334,6 +342,7 @@ padding: var(--route-btn-padding); background: var(--route-btn-bg); height: var(--route-btn-height); + margin: var(--route-btn-margin); text-align: center; transition: 200ms all; &:has(img){ @@ -391,4 +400,15 @@ gap: 21px; margin: 20px 0; } + .route_number{ + @media (max-width: 1160px) { + --route-number-font-size: 10px; + --route-number-margin-top: 10px; + } + color: #000000; + width: 100%; + text-align: right; + font-size: var(--route-number-font-size); + margin-top: var(--route-number-margin-top); + } } \ No newline at end of file diff --git a/templates/v2/widgets/w_customer_route_card.html b/templates/v2/widgets/w_customer_route_card.html index 1b32dfa..cd99bf1 100644 --- a/templates/v2/widgets/w_customer_route_card.html +++ b/templates/v2/widgets/w_customer_route_card.html @@ -24,6 +24,7 @@ {% trans "Комментарий отсутствует" %} {% endif %} +
{% trans "Объявление №" %} {{ route.id }}
@@ -107,12 +108,6 @@ {{ route.from_city.name }}/{{ route.from_city.country.name }}
- {% if route.owner_type == 'mover' %} -
- {% trans "Отправка:" %} -
{{ route.departure_DT|date:'d F Y' }}
-
- {% endif %}
@@ -132,6 +127,15 @@ {% trans "Дата доставки:" %}
{{ route.arrival_DT|date:'d F Y' }}
+ {% else %} +
+ {% trans "Отправка:" %} +
{{ route.departure_DT|date:'d F Y' }}
+
+
+ {% trans "Прибытие:" %} +
{{ route.arrival_DT|date:'d F Y' }}
+
{% endif %}
@@ -145,12 +149,6 @@ {{ route.to_city.name }}/{{ route.to_city.country.name }}
- {% if route.owner_type == 'mover' %} -
- {% trans "Прибытие:" %} -
{{ route.arrival_DT|date:'d F Y' }}
-
- {% endif %} @@ -170,7 +168,7 @@ -
+
{{ route.phone }}