diff --git a/web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css b/web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css index a66d50b..488ee37 100644 --- a/web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css +++ b/web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css @@ -202,7 +202,7 @@ h2, h3 { } @media (max-width: 810px) { .layout-container main#home { - padding-top: 380px; + padding-top: 300px; } } @media (max-width: 810px) { @@ -432,17 +432,17 @@ header .header_nav_container { transform: translateX(0); transition: transform 0.3s ease-in-out; z-index: -1; -} -@media (max-width: 1090px) { - header .header_nav_container { - height: fit-content; - } + display: flex; + flex-direction: column; } @media (max-width: 500px) { header .header_nav_container { flex: 0 0 40%; } } +header .header_nav_container #block-quartiers-de-demain-entete { + margin: auto; +} header .header_nav_container #block-quartiers-de-demain-entete h2 { display: none; } @@ -564,7 +564,6 @@ header .header:hover + .header_nav_container { flex: 1 0 100%; position: relative; left: -100%; - top: -45px; } } @@ -607,7 +606,11 @@ header .header:hover + .header_nav_container { flex: 1 0 100%; position: relative; left: -100%; - top: -75px; + } +} +@media (max-width: 550px) { + .header--collapsed-already .header_nav_container { + top: 0px; } } @@ -1511,9 +1514,19 @@ footer { #actus-caroussel button { top: -2.5rem; } +@media (max-width: 810px) { + #actus-caroussel button { + top: -1.5rem; + } +} #actus-caroussel .content-actus .slick-list { padding-bottom: 4rem; } +@media (max-width: 810px) { + #actus-caroussel .content-actus .slick-list { + padding-bottom: 0rem; + } +} #actus-caroussel .content-actus .view { display: flex; flex-direction: row; @@ -3171,8 +3184,11 @@ body { #page-node .content_container .node-type-actualite { width: 100%; padding-bottom: 7rem; + display: flex; + flex-direction: column; } #page-node .content_container .node-type-actualite .infos-actu { + order: 1; display: flex; flex-direction: row; border-top: solid red 1px; @@ -3203,12 +3219,14 @@ body { padding-right: 0.4rem; } #page-node .content_container .node-type-actualite .field_body { + order: 2; padding-bottom: 2rem; } #page-node .content_container .node-type-actualite .field_body p { font-size: 0.8rem; } #page-node .content_container .node-type-actualite .field_field_liens { + order: 3; padding-bottom: 2rem; } #page-node .content_container .node-type-actualite .field_field_liens a { @@ -3229,6 +3247,12 @@ body { padding-right: 0.2rem; padding-left: 0.2rem; } +#page-node .content_container .node-type-actualite .field_field_liens a:not(.ext) { + display: none; +} +#page-node .content_container .node-type-actualite .field_field_images { + order: 5; +} #page-node .content_container .node-type-actualite .field_field_images img { width: 100%; height: auto; diff --git a/web/themes/custom/quartiers_de_demain/dist/assets/img/formes-animees-original.svg b/web/themes/custom/quartiers_de_demain/dist/assets/img/formes-animees-live.svg similarity index 100% rename from web/themes/custom/quartiers_de_demain/dist/assets/img/formes-animees-original.svg rename to web/themes/custom/quartiers_de_demain/dist/assets/img/formes-animees-live.svg diff --git a/web/themes/custom/quartiers_de_demain/dist/assets/img/rect4.svg b/web/themes/custom/quartiers_de_demain/dist/assets/img/rect4.svg new file mode 100644 index 0000000..d0090ab --- /dev/null +++ b/web/themes/custom/quartiers_de_demain/dist/assets/img/rect4.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/themes/custom/quartiers_de_demain/src/assets/scss/global/_layout.scss b/web/themes/custom/quartiers_de_demain/src/assets/scss/global/_layout.scss index a97dd0b..8ebe28f 100644 --- a/web/themes/custom/quartiers_de_demain/src/assets/scss/global/_layout.scss +++ b/web/themes/custom/quartiers_de_demain/src/assets/scss/global/_layout.scss @@ -45,7 +45,7 @@ $width-menu-slidedown : 550px; @media(max-width: 810px){ - padding-top: 380px; + padding-top: 300px; } } } diff --git a/web/themes/custom/quartiers_de_demain/src/assets/scss/pages/actualite.scss b/web/themes/custom/quartiers_de_demain/src/assets/scss/pages/actualite.scss index 225cff8..a2ff58f 100644 --- a/web/themes/custom/quartiers_de_demain/src/assets/scss/pages/actualite.scss +++ b/web/themes/custom/quartiers_de_demain/src/assets/scss/pages/actualite.scss @@ -33,7 +33,10 @@ .node-type-actualite{ width: 100%; padding-bottom: 7rem; + display: flex; + flex-direction: column; .infos-actu{ + order: 1; display: flex; flex-direction: row; border-top: solid red 1px; @@ -65,12 +68,14 @@ } .field_body { + order: 2; padding-bottom: 2rem; p{ font-size: 0.8rem; } } .field_field_liens{ + order: 3; padding-bottom: 2rem; a{ padding-left: 0.5rem; @@ -91,9 +96,14 @@ } } + + a:not(.ext){ + display: none; + } } .field_field_images{ + order: 5; img{ width: 100%; height: auto; diff --git a/web/themes/custom/quartiers_de_demain/src/assets/scss/partials/actu-caroussel-home.scss b/web/themes/custom/quartiers_de_demain/src/assets/scss/partials/actu-caroussel-home.scss index f8ad2f8..2661e44 100644 --- a/web/themes/custom/quartiers_de_demain/src/assets/scss/partials/actu-caroussel-home.scss +++ b/web/themes/custom/quartiers_de_demain/src/assets/scss/partials/actu-caroussel-home.scss @@ -16,10 +16,16 @@ } button{ top: -2.5rem; + @media(max-width: 810px){ + top: -1.5rem; + } } .content-actus{ .slick-list{ padding-bottom: 4rem; + @media(max-width: 810px){ + padding-bottom: 0rem; + } } .view{ display: flex; diff --git a/web/themes/custom/quartiers_de_demain/src/assets/scss/partials/header.scss b/web/themes/custom/quartiers_de_demain/src/assets/scss/partials/header.scss index 9d693b4..19a32c7 100644 --- a/web/themes/custom/quartiers_de_demain/src/assets/scss/partials/header.scss +++ b/web/themes/custom/quartiers_de_demain/src/assets/scss/partials/header.scss @@ -184,14 +184,18 @@ header{ transform: translateX(0); transition: transform 0.3s ease-in-out; z-index: -1 ; + display: flex; + flex-direction: column; + @media(max-width: 1090px){ // text-align:left; - height: fit-content; + // height: fit-content; } @media(max-width: 500px){ flex: 0 0 40%; } #block-quartiers-de-demain-entete{ + margin: auto; h2{ display: none; } @@ -307,7 +311,7 @@ header{ flex: 1 0 100%; position: relative; left: -100%; - top: -45px; + // top: -45px; /* a remettre et faire varier si ajoute éléments dans menu */ } } @@ -343,7 +347,10 @@ header{ flex: 1 0 100%; position: relative; left: -100%; - top: -75px; + // top: -75px; + } + @media(max-width: 550px){ + top: 0px; } } diff --git a/web/themes/custom/quartiers_de_demain/templates/node--actualite.html.twig b/web/themes/custom/quartiers_de_demain/templates/node--actualite.html.twig index 7394958..25ffad1 100644 --- a/web/themes/custom/quartiers_de_demain/templates/node--actualite.html.twig +++ b/web/themes/custom/quartiers_de_demain/templates/node--actualite.html.twig @@ -92,22 +92,17 @@ {# {{ content }} #} {# #} {% block content %} - -{{ label }} -{{content.field_images}} + {{ label }} + {{content.field_images}} {{content.field_type_d_actualite}} {{content.field_date}} - - - {{content.body}} - {{content.field_liens}} + {{content.field_liens}} - - - + + {% endblock %}