This commit is contained in:
armansansd 2022-04-27 13:16:07 +02:00
parent 47b5159777
commit fded5af68d
8 changed files with 119 additions and 485 deletions

166
composer.lock generated
View File

@ -620,16 +620,16 @@
},
{
"name": "consolidation/annotated-command",
"version": "4.5.4",
"version": "4.5.5",
"source": {
"type": "git",
"url": "https://github.com/consolidation/annotated-command.git",
"reference": "93398c3166d9026ab93219ce23b2092b4d7b7904"
"reference": "67cea8e8e7656b74da651ea6f49321853996c0fd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/consolidation/annotated-command/zipball/93398c3166d9026ab93219ce23b2092b4d7b7904",
"reference": "93398c3166d9026ab93219ce23b2092b4d7b7904",
"url": "https://api.github.com/repos/consolidation/annotated-command/zipball/67cea8e8e7656b74da651ea6f49321853996c0fd",
"reference": "67cea8e8e7656b74da651ea6f49321853996c0fd",
"shasum": ""
},
"require": {
@ -670,9 +670,9 @@
"description": "Initialize Symfony Console commands from annotated command class methods.",
"support": {
"issues": "https://github.com/consolidation/annotated-command/issues",
"source": "https://github.com/consolidation/annotated-command/tree/4.5.4"
"source": "https://github.com/consolidation/annotated-command/tree/4.5.5"
},
"time": "2022-04-05T17:58:10+00:00"
"time": "2022-04-26T16:18:25+00:00"
},
{
"name": "consolidation/config",
@ -3148,7 +3148,6 @@
},
{
"name": "drupal/config_filter",
<<<<<<< HEAD
"version": "1.9.0",
"source": {
"type": "git",
@ -3160,19 +3159,6 @@
"url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.9.zip",
"reference": "8.x-1.9",
"shasum": "cf6919fc5039771f8e6c2ed203f29ab0eca8d91f"
=======
"version": "2.3.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/config_filter.git",
"reference": "8.x-2.3"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.3.zip",
"reference": "8.x-2.3",
"shasum": "043fc712997cdd6b384024ab96bebba70e5c6b26"
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
},
"require": {
"drupal/core": "^8 || ^9"
@ -3183,13 +3169,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
<<<<<<< HEAD
"version": "8.x-1.9",
"datestamp": "1649336052",
=======
"version": "8.x-2.3",
"datestamp": "1649336106",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@ -3799,18 +3780,6 @@
},
{
"name": "drupal/core",
<<<<<<< HEAD
"version": "9.3.9",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
"reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774",
"reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774",
=======
"version": "9.3.12",
"source": {
"type": "git",
@ -3821,7 +3790,6 @@
"type": "zip",
"url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
"reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"shasum": ""
},
"require": {
@ -4063,15 +4031,6 @@
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"support": {
<<<<<<< HEAD
"source": "https://github.com/drupal/core/tree/9.3.9"
},
"time": "2022-03-21T21:21:58+00:00"
},
{
"name": "drupal/core-composer-scaffold",
"version": "9.3.9",
=======
"source": "https://github.com/drupal/core/tree/9.3.12"
},
"time": "2022-04-20T14:25:27+00:00"
@ -4079,7 +4038,6 @@
{
"name": "drupal/core-composer-scaffold",
"version": "9.3.12",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"source": {
"type": "git",
"url": "https://github.com/drupal/core-composer-scaffold.git",
@ -4123,21 +4081,13 @@
"drupal"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.9"
=======
"source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12"
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
},
"time": "2022-02-24T17:40:56+00:00"
},
{
"name": "drupal/core-project-message",
<<<<<<< HEAD
"version": "9.3.9",
=======
"version": "9.3.12",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"source": {
"type": "git",
"url": "https://github.com/drupal/core-project-message.git",
@ -4172,28 +4122,12 @@
"drupal"
],
"support": {
<<<<<<< HEAD
"source": "https://github.com/drupal/core-project-message/tree/9.3.9"
=======
"source": "https://github.com/drupal/core-project-message/tree/9.3.12"
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
},
"time": "2022-02-24T17:40:56+00:00"
},
{
"name": "drupal/core-recommended",
<<<<<<< HEAD
"version": "9.3.9",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
"reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411",
"reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411",
=======
"version": "9.3.12",
"source": {
"type": "git",
@ -4204,7 +4138,6 @@
"type": "zip",
"url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
"reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"shasum": ""
},
"require": {
@ -4213,11 +4146,7 @@
"doctrine/annotations": "1.13.2",
"doctrine/lexer": "1.2.1",
"doctrine/reflection": "1.2.2",
<<<<<<< HEAD
"drupal/core": "9.3.9",
=======
"drupal/core": "9.3.12",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"egulias/email-validator": "3.1.2",
"guzzlehttp/guzzle": "6.5.5",
"guzzlehttp/promises": "1.5.1",
@ -4279,15 +4208,9 @@
],
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
"support": {
<<<<<<< HEAD
"source": "https://github.com/drupal/core-recommended/tree/9.3.9"
},
"time": "2022-03-21T21:21:58+00:00"
=======
"source": "https://github.com/drupal/core-recommended/tree/9.3.12"
},
"time": "2022-04-20T14:25:27+00:00"
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
},
{
"name": "drupal/cshs",
@ -5406,13 +5329,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
<<<<<<< HEAD
"version": "8.x-3.2",
"datestamp": "1628513585",
=======
"version": "8.x-3.2+7-dev",
"datestamp": "1635152929",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@ -5765,7 +5683,6 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.39",
"datestamp": "1649534200",
"security-coverage": {
@ -7216,19 +7133,6 @@
},
{
"name": "drupal/matomo",
<<<<<<< HEAD
"version": "1.17.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/matomo.git",
"reference": "8.x-1.17"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.17.zip",
"reference": "8.x-1.17",
"shasum": "091f946ec7a09d6b4463e5d75adca9cdcdff2918"
=======
"version": "1.18.0",
"source": {
"type": "git",
@ -7240,7 +7144,6 @@
"url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.18.zip",
"reference": "8.x-1.18",
"shasum": "ad0d24ba12bca16e666a5f9d404cd56926839169"
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
},
"require": {
"drupal/core": "^8.8.0 || ^9.0.0"
@ -7256,13 +7159,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
<<<<<<< HEAD
"version": "8.x-1.17",
"datestamp": "1647206848",
=======
"version": "8.x-1.18",
"datestamp": "1649792938",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@ -7897,11 +7795,7 @@
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/paragraphs.git",
<<<<<<< HEAD
"reference": "80e4c5bfbfbf27d4cb59a228c0011ce81496ba76"
=======
"reference": "6a75a6148bc31ffc5662c9a8130d32ec16aaaf6f"
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
},
"require": {
"drupal/core": "^9.2",
@ -7929,13 +7823,8 @@
"dev-1.x": "1.x-dev"
},
"drupal": {
<<<<<<< HEAD
"version": "8.x-1.13+5-dev",
"datestamp": "1646129836",
=======
"version": "8.x-1.13+11-dev",
"datestamp": "1650520402",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"security-coverage": {
"status": "not-covered",
"message": "Dev releases are not covered by Drupal security advisories."
@ -9473,7 +9362,6 @@
},
{
"name": "drupal/views_bulk_operations",
<<<<<<< HEAD
"version": "3.13.0",
"source": {
"type": "git",
@ -9485,22 +9373,9 @@
"url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.13.zip",
"reference": "8.x-3.13",
"shasum": "70583d08b91be3b5e008f571589425c2176eb73b"
=======
"version": "4.1.2",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_bulk_operations.git",
"reference": "4.1.2"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.1.2.zip",
"reference": "4.1.2",
"shasum": "1cfa10f755240cae46de8d8684272a9a8907a730"
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
},
"require": {
"drupal/core": "^9"
"drupal/core": "^8.8 || ^9"
},
"require-dev": {
"drush/drush": "^10"
@ -9511,13 +9386,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
<<<<<<< HEAD
"version": "8.x-3.13",
"datestamp": "1619697066",
=======
"version": "4.1.2",
"datestamp": "1647943086",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@ -12310,7 +12180,6 @@
},
{
"name": "psy/psysh",
<<<<<<< HEAD
"version": "v0.10.12",
"source": {
"type": "git",
@ -12321,18 +12190,6 @@
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
"reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
=======
"version": "v0.11.2",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "7f7da640d68b9c9fec819caae7c744a213df6514"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/7f7da640d68b9c9fec819caae7c744a213df6514",
"reference": "7f7da640d68b9c9fec819caae7c744a213df6514",
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
"shasum": ""
},
"require": {
@ -12343,9 +12200,6 @@
"symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10",
"symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7"
},
"conflict": {
"symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.2",
"hoa/console": "3.17.*"
@ -12395,15 +12249,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
<<<<<<< HEAD
"source": "https://github.com/bobthecow/psysh/tree/v0.10.12"
},
"time": "2021-11-30T14:05:36+00:00"
=======
"source": "https://github.com/bobthecow/psysh/tree/v0.11.2"
},
"time": "2022-02-28T15:28:54+00:00"
>>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
},
{
"name": "ralouphie/getallheaders",

File diff suppressed because one or more lines are too long

View File

@ -1,9 +1,7 @@
// page centre de ressources
// & ressource simple
.path-centre-de-ressources{
// //tmp
// .slick-slider{
// display: none;
// }
//colo programme
.programme-1{
color: $col-1;

View File

@ -1,5 +1,5 @@
.page-node-type-theme, .page-node-type-projet{
///// copy menu left
///// menu left
.block-region-first{
.field_programme{
display: none;
@ -74,10 +74,8 @@
}
}
/////fin copy menu left
/////fin menu left
// couleur popsu
.field_logo{
display: block;
}
@ -104,6 +102,7 @@
background: $col-met;
}
}
//fin couleurp popsu
// .block-region-first{
// padding: 1rem;
// .field_programme{
@ -119,27 +118,7 @@
// }
// }
.block-region-third{
margin-top: 20rem;
#node\:field_equipes{
// visibility: hidden;
}
#node\:field_evenements_lies{
article{
display: grid;
>div{
//vgrid-row: 1;
text-transform: none;
color: #fff !important;
background: none;
font-size: .6rem;
margin: 0;
padding: .1rem 1rem;
}
}
}
}
//contenu
.block-region-second{
#node\:title:before{
clear: both;
@ -178,7 +157,7 @@
margin-bottom: 1rem;
}
#node\:field_image,.field_diaporama{
#node\:field_image,.field_diaporama,.field_image{
width: 150%;
margin-bottom: 1rem;
@ -323,6 +302,32 @@
}
}
}
//end contenus central
//menu droite
.block-region-third{
margin-top: 20rem;
#node\:field_evenements_lies{
article{
display: grid;
>div{
//vgrid-row: 1;
text-transform: none;
color: #fff !important;
background: none;
font-size: .6rem;
margin: 0;
padding: .1rem 1rem;
}
}
}
}
// fin menu droite
// gallery de projet sous contenu du théme / ville
.block-region-bottom{
#node\:field_projets_lies, #node\:field_themes_lies, #node\:field_comparatifs_associes{
@ -346,102 +351,6 @@
}
// #node\:field_equipes{
// padding: 1rem 0;
// border-bottom: 3px dotted gray;
// h2{
// cursor: pointer;
// display: grid;
// grid-template-columns: 95% 5%;
// align-content: center;
// font-family: "trueno";
// font-size: 1rem;
// font-weight: 600;
// text-transform: initial;
// // text-align: center;
// }
// h2:after{
// content: '';
// -webkit-transition: all 250ms ease;
// -moz-transition: all 250ms ease;
// -o-transition: all 250ms ease;
// transition: all 250ms ease;
// align-self: center;
// justify-self: center;
// font-size: $font-big;
// }
// .rotate:after{
// transform: rotate(180deg);
// -webkit-transition: all 250ms ease;
// -moz-transition: all 250ms ease;
// -o-transition: all 250ms ease;
// transition: all 250ms ease;
// }
// .field_equipes{
// display: none;
// .paragraph{
// display: grid;
// .field_membres{
// grid-row: 2;
// // >div:first-child{
// // display: none;
// // }
// .paragraph{
// display: grid;
// grid-template-columns: auto 1fr;
// .field_nom{
// grid-column: 2;
// grid-row: 1;
// padding-left: .3rem;
// display: inline-block;
// width: auto;
// font-weight: 500;
// >div:first-child{
// display: none;
// }
// div:nth-of-type(2){
// display: inline-block;
// width: auto;
// }
// }
// .field_prenom{
// grid-column: 1;
// grid-row: 1;
// display: inline-block;
// font-weight: 500;
// >div:first-child{
// display: none;
// }
// div:nth-of-type(2){
// display: inline-block;
// width: auto;
// }
// }
// .field_fonction{
// grid-column: 1 / span 2;
// >div:first-child{
// display: none;
// }
// }
// margin-bottom: .3rem;
// }
// margin-bottom: .5rem;
// }
// .field_type_equipe{
// grid-row: 1;
// font-weight: 600;
// font-size: $font-medium;
// margin-bottom: .5rem;
// div:first-child{
// display: none;
// }
// }
// }
// }
// }
#node\:field_partenaires{
h2{
// color: black;
@ -572,12 +481,7 @@
}
.page-node-type-projet{
#node\:title:before{
content: "ville";
}
.page-node-type-projet, .page-node-type-theme{
.field_projets_lies, .field_themes_lies, .field_comparatifs_associes{
article{
display: grid;
@ -597,7 +501,7 @@
}
}
.field_diaporama {
.field_diaporama,.field_image {
position: relative;
width: 100%;
overflow: hidden;
@ -615,7 +519,7 @@
}
}
}
.field_diaporama:after {
.field_diaporama:after, .field_image:after {
content: "";
display: block;
padding-top: 100%;
@ -712,6 +616,27 @@
}
}
}
.page-node-type-projet{
#node\:title:before{
content: "ville";
}
#node\:field_equipes{
h2{
font-family: "trueno" !important;
font-size: 1rem;
font-weight: 600;
text-transform: none;
margin: 1rem 0;
}
.field_type_equipe{
font-weight: 500;
}
}
}
.page-node-type-theme{
#node\:title:before{
content: "thème";
@ -725,156 +650,27 @@
}
}
.block-region-third{
#node\:field_partenaires{
h2{
border:none;
font-family: trueno;
font-size: .8rem;
font-weight: 600;
margin-top: 0;
padding: .4rem 0.5rem;
display: block;
&:after{
display:none;
}
}
.field_partenaires{
display: grid;
}
}
}
// .block-region-third{
// #node\:field_partenaires{
// h2{
// border:none;
// font-family: trueno;
// font-size: .8rem;
// font-weight: 600;
// margin-top: 0;
// padding: .4rem 0.5rem;
// display: block;
// &:after{
// display:none;
// }
// }
// .field_partenaires{
// display: grid;
// }
// }
// }
.field_projets_lies, .field_themes_lies{
article{
display: grid;
h2{
grid-row: 2;
text-align: left !important;
text-transform: none !important;
line-height: 1.3;
margin: .5rem 0 0 0;
font-size: $font-normal;
font-weight: 400;
a{
text-decoration: none;
&:hover{
text-decoration: underline;
}
}
}
.field_diaporama {
position: relative;
width: 100%;
overflow: hidden;
margin-top: -.5rem;
z-index: -1;
a{
position: absolute;
height: 100%;
width: 100%;
object-fit: cover;
img{
height: 100% ;
width: 100%;
object-fit: cover;
}
}
}
.field_diaporama:after {
content: "";
display: block;
padding-top: 100%;
}
.field_programme{
text-transform: uppercase;
display: inline-block;
font-weight: 600;
padding: .02rem .3rem;
grid-column: 1;
grid-row: 1;
z-index: 1;
margin-bottom: -.5rem;
margin-left: .2rem;
color: white;
a{
text-decoration: none;
}
}
//// prog color
&.programme-1{
h2{
color: $col-1 !important;
}
.field_programme{
background: $col-1 ;
}
}
&.programme-2{
h2{
color: $col-2 !important;
}
.field_programme{
background: $col-2 ;
}
}
&.programme-3{
h2{
color: $col-eur !important;
}
.field_programme{
background: $col-eur ;
}
}
&.programme-4{
h2{
color: $col-1;
}
.field_programme{
background:$col-1 ;
}
}
&.programme-5{
h2{
color: $col-mond !important;
}
.field_programme{
background: $col-mond ;
}
}
&.programme-6{
h2{
color: $col-ter !important;
}
.field_programme{
background: $col-ter ;
}
}
&.programme-7{
h2{
color: $col-met !important;
}
.field_programme{
background: $col-met ;
}
}
}
}
// si ressources affichée dans page théme
#node\:field_ressources_liees{
background: $trame;
// h2{

View File

@ -1,7 +1,4 @@
//voir theme
//page ville sidebar
.programme-1{
.block-region-third .field_ressources_liees{
@ -54,16 +51,6 @@
.field_programme{
display: none;
// display: inline-block;
// width: auto;
// color: transparent;
// font-weight: 600;
// text-transform: uppercase;
// font-size: .5rem;
// a{
// padding: .3rem .5rem;
// }
}
.field_sous_titre{
color: white !important;

View File

@ -77,10 +77,7 @@ body{
}
}
}
.slick-track{
display: flex;
align-items: center;
}
main{
h2{
text-transform: uppercase;
@ -91,31 +88,20 @@ main{
a{
color:inherit;
}
// .ext{
// display: none;
// }
.block-region-first{
#node\:field_programme{
.field_programme{
*{
background: none !important;
}
}
}
}
.footer_bottom_right_container{
.ext{
display: none;
}
}
strong, b{
font-weight: 600;
}
i, em{
font-style: italic;
}
// slick carrousel
.slick-track{
display: flex;
align-items: center;
}
.slick-arrow{
font-size: 0;
@ -150,6 +136,23 @@ i, em{
transform: rotate(180deg);
}
// end carousel
.block-region-first{
#node\:field_programme{
.field_programme{
*{
background: none !important;
}
}
}
}
.footer_bottom_right_container{
.ext{
display: none;
}
}
//map
@ -217,3 +220,5 @@ i, em{
}
}
//end map

View File

@ -1,3 +1,5 @@
// general layout
.layout--threecol-25-50-25{
display: grid;
grid-template-columns: 20% minmax(0,1fr) 20%;
@ -7,9 +9,7 @@
position: relative;
}
.layout-content{
// padding-bottom: 4rem;
}
.layout__region--bottom{
grid-column: 1 /span 3;
}

View File

@ -26,6 +26,7 @@
/*pages*/
@import "pages/partials/header_footer";
@import "pages/partials/villes_sidebar";
@import "pages/home";
@import "pages/ressources";
@import "pages/default";
@ -34,5 +35,4 @@
@import "pages/archives";
@import "pages/node-evenement-actu";
@import "pages/themes";
@import "pages/projet";