From 6515979251ac003287f637301fe7140f016f802d Mon Sep 17 00:00:00 2001 From: borissedw Date: Fri, 17 Nov 2023 19:58:09 +0300 Subject: [PATCH] 0.0.361 --- static/css/mobile_styles.css | 56 ++++++++++++++++----------------- static/css/styles(boris).css | 60 +++++++++++++++++++++++++++++++----- static/css/styles.css | 7 +++-- templates/pages/p_main.html | 32 ++++++++++++------- 4 files changed, 105 insertions(+), 50 deletions(-) diff --git a/static/css/mobile_styles.css b/static/css/mobile_styles.css index 820e747..eb64c2e 100644 --- a/static/css/mobile_styles.css +++ b/static/css/mobile_styles.css @@ -84,7 +84,7 @@ border-top: 2px solid #E6E6E6; border-right: 2px solid #E6E6E6; border-bottom: 2px solid #E6E6E6; - width: 40.5%; + width: 60px; } .abbreviation_airport_in_search{ float: left; @@ -92,7 +92,7 @@ border-right: 2px solid #E6E6E6; border-bottom: 2px solid #E6E6E6; height: 96%; - width: 40%; + /*width: 40%;*/ } .from_address_point_txt.find_route.first{ @@ -103,7 +103,7 @@ } .to_address_point_txt.find_route{ - width: 55.6%; + /*width: 55.6%;*/ float: left; border-top: 2px solid #E6E6E6; border-left: 2px solid #E6E6E6; @@ -498,7 +498,7 @@ .cut_width_f_curtain{ position: sticky; - top: 61px; + top: 0; } .menu_buttons{ /*background: #FFFFFF;*/ @@ -1051,12 +1051,12 @@ } } @media (max-width: 828px){ - .to_address_point_txt.find_route { - width: 54.6%; - } - .from_address_point_txt.find_route.first { - width: 54.1%; - } + /*.to_address_point_txt.find_route {*/ + /*width: 54.6%;*/ + /*}*/ + /*.from_address_point_txt.find_route.first {*/ + /* width: 54.1%;*/ + /*}*/ } @media (max-width: 776px){ @@ -1125,12 +1125,12 @@ } } @media (max-width: 687px){ - .to_address_point_txt.find_route { - width: 52.6%; - } - .from_address_point_txt.find_route.first { - width: 52.1%; - } + /*.to_address_point_txt.find_route {*/ + /* width: 52.6%;*/ + /*}*/ + /*.from_address_point_txt.find_route.first {*/ + /* width: 52.1%;*/ + /*}*/ .subscribe_inf{ width: 95%; @@ -1188,12 +1188,12 @@ .cont-el-form-search-carrier.last > select{ width: 100%; } - .to_address_point_txt.find_route { - width: 51.6%; - } - .from_address_point_txt.find_route.first { - width: 51.1%; - } + /* .to_address_point_txt.find_route {*/ + /* width: 51.6%;*/ + /*}*/ + /*.from_address_point_txt.find_route.first {*/ + /* width: 51.1%;*/ + /*}*/ .another_subscribe{ padding: unset; flex-direction: column; @@ -1202,13 +1202,13 @@ } @media (max-width: 466px) { - .to_address_point_txt.find_route { - width: 48.4%; - } + /*.to_address_point_txt.find_route {*/ + /* width: 48.4%;*/ + /*}*/ - .from_address_point_txt.find_route.first { - width: 47.95%; - } + /*.from_address_point_txt.find_route.first {*/ + /* width: 47.95%;*/ + /*}*/ .container_inp_w_abr { diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index ed42ebb..2284b72 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -949,12 +949,13 @@ border-left: 1px solid #E6E6E6; display: block; height: 20px; - width: 55.1%; + /*width: 55.1%;*/ float: left; background-image: none !important; margin-top: 0; padding: 20px 15.2px; border-radius: 10px 0 0 10px; + width: calc(100% - 95px); } .to_address_point_txt.find_route{ @@ -964,7 +965,7 @@ border-left: 1px solid #E6E6E6; display: block; height: 20px; - width: 55.1%; + width: calc(100% - 95px); border-radius: 0; float: left; background-image: none !important; @@ -1016,7 +1017,7 @@ padding: 20px 10px; background: url(/static/img/svg/Calendar.svg) white 50%; background-repeat: no-repeat; - background-position: right 5% bottom 45%; + background-position: right 2% bottom 45%; } @@ -1060,8 +1061,8 @@ .abbreviation_airport_in_search{ display: inline-block; float: left; - width: 29%; height: 97%; + width: 60px; border-top: 1px solid #E6E6E6; border-right: 1px solid #E6E6E6; border-bottom: 1px solid #E6E6E6; @@ -1090,8 +1091,8 @@ } -.block-filters-find-route{ - min-height: 660px; +.block-filters-find-route { + min-height: calc(100vh - 200px); background: #FFFFFF; box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20); width: 26%; @@ -1100,8 +1101,9 @@ position: sticky; top: 76px; border-radius: 10px; + max-height: calc(100vh - 125px); + overflow-y: auto; } - .block_w_paging.routes{ width: 68%; float: right; @@ -2442,8 +2444,50 @@ transition: 200ms; } +/* news rewrite*/ +.news_block{ + display: flex; + flex-wrap: wrap; + width: 100%; + justify-content: center; +} +.cont_one_news{ + width: 300px; + display: block; + text-decoration: none; + color: #000000; + margin: 20px; + background: #FFFFFF; + box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20); + padding: 15px; + border-radius: 10px; +} + +.cont_img_one_news{ + height: 250px; + overflow: hidden; +} + +.img_one_news{ + display: block; + aspect-ratio: 4/3; + /*height: 300px;*/ + object-fit: cover; +} + +.cont_content_one_news{ + height: calc(100% - 340px); +} + /*.subscribe_type_txt .f-r{*/ /* color: #FF613A;*/ -/*}*/ \ No newline at end of file +/*}*/ + + +.container_descript_one_news{ + width: 100%; + overflow-wrap: break-word; +} + diff --git a/static/css/styles.css b/static/css/styles.css index c1c6187..eca7e0e 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -2633,7 +2633,7 @@ details[open] summary ~ *{ } .news_item { - width: 413px; + width: 48%; margin-bottom: 2%; background-color: white; filter: drop-shadow(-1px 4px 10px rgba(198, 199, 203, 0.20)) drop-shadow(0px -1px 10px rgba(198, 199, 203, 0.20)); @@ -2659,9 +2659,10 @@ details[open] summary ~ *{ .news_img>img{ object-fit: cover; - height: 240px; - width: 370px; + width: 100%; border-radius: 10px; + aspect-ratio: 4 / 3; + max-height: 300px; } diff --git a/templates/pages/p_main.html b/templates/pages/p_main.html index 18fb866..e222cfb 100644 --- a/templates/pages/p_main.html +++ b/templates/pages/p_main.html @@ -239,20 +239,30 @@ {##} {# {% endfor %}#} {#
#} +
{% for art in articles %} -
- -
-
{{ art.name }}
-
- {{ art.description|truncatechars:100 }} -
+ +
+ +
+
+
+ {{ art.name|truncatechars:100 }}
- -
- - {#
{{ art.text|safe }}
#} +
+ {{ art.description|truncatechars:100 }} +
+
+ {% endfor %} +
+ + +{# {% url "article_one" art.url %}#} +{# {{ MEDIA_URL }}{{ art.picture }}#} +{# {{ art.description|truncatechars:100 }}#} + + {#
#}