bachir/drupal-quartiersdedemain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bachir:f15763890cbd4b8de1a0c78da4f5e7905f23f2c8
Branches Tags
bachir:master
bachir:prod
bachir:stage
bachir:newPages
bachir:live
bachir:tmp
bachir:avantLive
bachir:prd
..
compare: bachir:d35a3a314088770a1af19b6d19398643195ae830
Branches Tags
bachir:master
bachir:prod
bachir:stage
bachir:newPages
bachir:live
bachir:tmp
bachir:avantLive
bachir:prd

No commits in common. "f15763890cbd4b8de1a0c78da4f5e7905f23f2c8" and "d35a3a314088770a1af19b6d19398643195ae830" have entirely different histories.
f15763890c ... d35a3a3140

5 changed files with 18 additions and 60 deletions
Show Stats Expand all files Collapse all files

2
web/themes/custom/quartiers_de_demain/dist/assets/bundle.js vendored
View File

File diff suppressed because one or more lines are too long

28
web/themes/custom/quartiers_de_demain/dist/assets/css/bundle.css vendored
View File

@ -805,6 +805,7 @@ footer {
width: 20%;
position: fixed;
top: 250px;
margin: 1rem 2rem;
background-color: transparent;
}
@media (max-width: 810px) {
@ -812,8 +813,6 @@ footer {
position: relative;
width: 80%;
top: 160px;
margin: auto;
margin-top: 1rem;
}
}
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeressourcespage-1,
@ -827,8 +826,6 @@ footer {
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeactuspage-1 {
display: flex;
flex-direction: column;
margin: auto;
width: auto;
}
}
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeressourcespage-1 h2,
@ -841,11 +838,6 @@ footer {
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeactuspage-1 h2::after {
content: " :";
}
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeressourcespage-1 form .js-form-item,
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeactuspage-1 form .js-form-item {
display: flex;
margin-bottom: 0.5rem;
}
@media (max-width: 810px) {
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeressourcespage-1 form .js-form-item,
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeactuspage-1 form .js-form-item {
@ -854,20 +846,9 @@ footer {
justify-content: space-between;
}
}
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeressourcespage-1 form .js-form-item label,
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeactuspage-1 form .js-form-item label {
flex: 2 1 auto;
}
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeressourcespage-1 form .js-form-item input,
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeactuspage-1 form .js-form-item input {
flex: 2 1 auto;
max-width: 55%;
}
@media (max-width: 810px) {
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeressourcespage-1 form .js-form-item input,
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeactuspage-1 form .js-form-item input {
max-width: 100%;
}
}
@media (max-width: 810px) {
.layout-sidebar-first #block-quartiers-de-demain-formulaireexposeressourcespage-1 form,
@ -882,6 +863,7 @@ footer {
display: flex;
flex-direction: row;
justify-content: space-evenly;
margin-bottom: 0.5rem;
border-bottom: solid black 0.5px;
padding-top: 0.5rem;
font-size: 0.7rem;
@ -3409,11 +3391,10 @@ body {
}
#page-node .content_container .node-type-actualite div .field_field_site {
margin-left: 0.5rem;
align-items: center;
}
#page-node .content_container .node-type-actualite div .field_field_site a {
color: red;
font-size: 0.7rem;
font-size: 0.6rem;
font-weight: 600;
display: inline-flex;
align-items: center;
@ -3423,7 +3404,7 @@ body {
content: "";
display: inline-block;
width: 10px; /* Ajuste la largeur */
height: 20px; /* Ajuste la hauteur */
height: 17px; /* Ajuste la hauteur */
background-image: url("../img/map_pointer.svg");
background-size: contain;
background-repeat: no-repeat;
@ -3473,7 +3454,6 @@ body {
margin-left: 1rem;
padding-right: 1rem;
justify-content: space-between;
align-items: center;
}
#page-node .content_container .node-type-actualite .infos-actu .field_field_date::before {
content: url("../img/date-actu.svg");

17
web/themes/custom/quartiers_de_demain/src/assets/js/quartiers_de_demain.js
View File

@ -402,10 +402,6 @@ $( document ).ready(function() {
// });
//////////// end slideshow actus home //////////////////////////
//////////// start slideshow images home //////////////////////////
$(document).ready(function () {
let diapohome = $('.config_pages--type--diaporama-home .diaporama');
@ -437,13 +433,13 @@ $(document).ready(function () {
}
});
//////////// end slideshow images home //////////////////////////
//////////// end slideshow actus home //////////////////////////
//////////// start slideshow /actualites //////////////////////////
$(document).ready(function(){
// Vérifier si on N'EST PAS sur la page #home
if (!$("#page-node").length) {
// if (!$("#home").length) {
let actuview2 = $('.content-wrapper-actu .field_field_images .actu-diaporama');
if (actuview2.length > 0) {
@ -451,14 +447,14 @@ $(document).ready(function(){
slidesToShow: 1,
dots: false,
arrows: true,
adaptiveHeight: false,
adaptiveHeight: true,
autoplay: false,
responsive: [
{
breakpoint: 810,
settings: {
slidesToShow: 1,
adaptiveHeight: false,
adaptiveHeight: true,
arrows: true,
draggable: true,
autoplay: false,
@ -467,10 +463,9 @@ $(document).ready(function(){
]
});
console.log('Slick activé sur les actualités');
console.log('Slick activé sur 1 actu');
}
// }
// } else {
// console.log('Slick désactivé sur la page Home');
console.log('Slick désactivé sur la page Home');
}
});

8
web/themes/custom/quartiers_de_demain/src/assets/scss/pages/actualite.scss
View File

@ -52,11 +52,9 @@
.field_field_site{
// margin-top: 0.2rem;
margin-left: 0.5rem;
align-items: center;
a{
color: red;
font-size: 0.7rem;
font-size: 0.6rem;
font-weight: 600;
display: inline-flex;
align-items: center;
@ -67,7 +65,7 @@
content: "";
display: inline-block;
width: 10px; /* Ajuste la largeur */
height: 20px; /* Ajuste la hauteur */
height: 17px; /* Ajuste la hauteur */
background-image: url("../img/map_pointer.svg");
background-size: contain;
background-repeat: no-repeat;
@ -126,8 +124,6 @@
margin-left: 1rem;
padding-right: 1rem;
justify-content: space-between;
align-items: center;
&::before{
content: url('../img/date-actu.svg');
padding-right: 0.4rem;

19
web/themes/custom/quartiers_de_demain/src/assets/scss/partials/aside.scss
View File

@ -5,14 +5,12 @@
// left: 3%;
top: $header-height-big;
// z-index: 98;
// margin: 1rem 2rem;
margin: 1rem 2rem;
background-color: transparent;
@media(max-width: 810px){
position: relative;
width: 80%;
top: $header-height-pad;
margin: auto;
margin-top: 1rem;
}
@ -24,8 +22,6 @@
@media(max-width: 810px){
display: flex;
flex-direction: column;
margin: auto;
width: auto;
}
h2{
text-transform: uppercase;
@ -38,30 +34,20 @@
form{
.js-form-item{
display: flex;
margin-bottom: 0.5rem;
@media(max-width: 810px){
display: flex;
flex-direction: column;
justify-content: space-between;
}
label{
flex: 2 1 auto;
}
input{
flex: 2 1 auto;
max-width: 55%;
@media(max-width: 810px){
max-width: 100%;
}
}
}
@media(max-width: 810px){
display: flex;
flex-direction: column;
justify-content: space-between;
}
}
@ -69,6 +55,7 @@
display: flex;
flex-direction: row;
justify-content: space-evenly;
margin-bottom: 0.5rem;
border-bottom: solid black 0.5px ;
padding-top: 0.5rem;
font-size: 0.7rem;