From a7d9dfe79a81c609f31e3383b0ee23d12591b4dc Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 29 Nov 2023 19:44:20 +0300 Subject: [PATCH] 0.0.268 all child are replaced --- static/css/mobile_styles.css | 38 ++-- static/css/styles.css | 190 +++++++----------- templates/blocks/b_footer.html | 24 +-- templates/blocks/profile/b_new_route.html | 14 +- .../blocks/profile/b_profile_first_page.html | 8 +- .../static_pages_blocks/b_mover_search.html | 8 +- templates/forms/f_login.html | 6 +- templates/forms/f_registration.html | 18 +- templates/widgets/w_route_info.html | 6 +- 9 files changed, 138 insertions(+), 174 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index be62168..d90aec2 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -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; } diff --git a/static/css/styles.css b/static/css/styles.css index dd659a8..7cc3cec 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -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%; diff --git a/templates/blocks/b_footer.html b/templates/blocks/b_footer.html index 8234cb5..8fbc6b3 100644 --- a/templates/blocks/b_footer.html +++ b/templates/blocks/b_footer.html @@ -18,16 +18,16 @@
-
{% trans "Информация" %}
-
-
-
{% trans "Перевезти посылку" %}
-
{% trans "Отправить посылку" %}
-
{% trans "Для отправителя" %}
-
{% trans "Для перевозчика" %}
-
+ +
+ +
-
@@ -41,8 +41,8 @@
-
{% trans "Свяжитесь с нами:" %}
-
+ +