Merge branch 'master' of gogs-figureslibres.io:bachir/popsu-d9

This commit is contained in:
Bachir Soussi Chiadmi 2022-05-11 10:29:57 +02:00
commit fcdaa2cce6
9 changed files with 115 additions and 52 deletions

@ -1 +1 @@
Subproject commit 179aa994156fa9c986cf9eb9262872abb9c651a2
Subproject commit 5069345d9dffca8ff935d7a01d2bc97a1272f063

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -100,9 +100,10 @@ $(function(){
{
breakpoint: 800,
settings: {
slidesToShow: 2,
slidesToShow: 1,
slidesToScroll: 1,
centerPadding: '0',
centerMode: true,
centerPadding: '30px',
}
}]
});
@ -118,9 +119,10 @@ $(function(){
{
breakpoint: 800,
settings: {
slidesToShow: 2,
slidesToShow: 1,
slidesToScroll: 1,
centerPadding: '0',
centerMode: true,
centerPadding: '30px',
}
}]
@ -158,9 +160,10 @@ $(function(){
{
breakpoint: 800,
settings: {
slidesToShow: 2,
slidesToShow: 1,
slidesToScroll: 1,
centerPadding: '0',
centerMode: true,
centerPadding: '30px',
}
}]
});
@ -438,5 +441,10 @@ if($(".page-node-type-static").length > 0){
});
}
//hide empty or unclickable sidebar
if($(".block-region-first").find("a").length == 0 ){
$(".block-region-first").hide();
};
});

View File

@ -13,7 +13,19 @@ use Drupal\Core\Url;
// }
function popsu_preprocess_html(&$variables) {
$node = \Drupal::routeMatch()->getParameter('node');
// $type = $node->getType();
//
$frontpage = \Drupal::service('path.matcher')->isFrontPage();
$variables['head_title']['slogan'] = \Drupal::config('system.site')->get('slogan');
//var_dump($variables['head_title']);
if( $frontpage == true){
$variables['head_title'] = $variables['head_title']["name"]." | ".$variables['head_title']['slogan'];
}else{
$variables['head_title'] = $variables['head_title']["name"];
}
if ($node){
if($node->hasField('field_programme') && $node->get('field_programme')->getString() != ""){
$variables['attributes']['class'][] = 'programme-' . $node->get('field_programme')->getString();

View File

@ -14,6 +14,11 @@
h2{
grid-column: 2 ;
padding: 0 0 0 20px;
@include breakpoint(small down) {
grid-column: 1 / span 2;
padding: 0 0 0 0px;
text-align: center;
}
}
div{
grid-column: 2;

View File

@ -287,6 +287,10 @@
//margin-top: -3rem;
column-gap: 1rem;
grid-template-columns: calc(10% - 3em) repeat(4, 20%);
@include breakpoint(small down) {
display: block;
padding: 1rem ;
}
&>div:first-child{
grid-column-start: 2;
}
@ -610,41 +614,41 @@
}
}
// Copy from themes
.block-region-first{
// .field_programme{
// display: none;
// }
// .block-region-first{
// // .field_programme{
// // display: none;
// // }
// #programme_toc-block_10{
// .views-row{
// padding-left: 1rem;
// // #programme_toc-block_10{
// // .views-row{
// // padding-left: 1rem;
// // }
// // }
// // @include breakpoint(small down) {
// // text-align: center;
// // }
// // position: absolute;
// // top: 0;
// // left: 0;
// padding: 1rem 1.5rem ;
// .body{
// cursor: pointer;
// transition: all 250ms;
// text-decoration: none;
// // &:hover{
// // padding: 0 0 0 .3rem;
// // }
// a{
// font-family: "duke";
// font-size: $font-large;
// }
// }
// @include breakpoint(small down) {
// text-align: center;
// }
// position: absolute;
// top: 0;
// left: 0;
padding: 1rem 1.5rem ;
.body{
cursor: pointer;
transition: all 250ms;
text-decoration: none;
// &:hover{
// padding: 0 0 0 .3rem;
// }
a{
font-family: "duke";
font-size: $font-large;
}
}
}
// Copy from themes end
.block-region-second{
display: grid;
@ -678,6 +682,10 @@
margin: 0;
}
#node\:field_sous_titre{
grid-row: auto / span 2;
grid-column: 4 / span 6;
}
#node\:field_image{
grid-column: 1 / span 3;
@ -693,6 +701,11 @@
.field_auteurs{
font-weight: 600;
font-size: $font-medium;
p{
position: relative;
float: left;
margin-right: .4rem;
}
}
}
#node\:body{
@ -729,6 +742,11 @@
}
#node\:field_collections{
//grid-row: 5;
grid-row: 3 / span 1;
grid-column: 4 / span 6;
font-size: $font-medium;
}
#node\:field_sous_titre{
grid-row: auto / span 1;
grid-column: 4/ span 6 ;
font-size: $font-medium;
@ -746,15 +764,28 @@
.block-region-third{
#node\:field_lien{
text-transform: uppercase;
font-weight: 600;
margin-top: 1rem;
font-weight: 500;
margin-top: 0;
.field_lien{
>div{
padding: 0;
}
}
>div{
word-wrap: break-word;
padding: 0;
}
a{
display: block;
margin: 0 auto;
background: #000;
color: #fff;
font-family: trueno;
font-weight: 500;
padding: .3rem .7rem;
font-size: .45rem;
text-decoration: none;
padding: .5rem;
background: white;
text-transform: uppercase;
}
}

View File

@ -327,7 +327,7 @@
//menu droite
.block-region-third{
margin-top: 14rem;
margin-top: 19rem;
@include breakpoint(small down) {
margin-top: 2rem;
}
@ -513,6 +513,7 @@
.field_projets_lies, .field_themes_lies, .field_comparatifs_associes{
article{
display: grid;
min-height: 4rem;
h2{
grid-row: 2;
text-align: left !important;
@ -558,17 +559,21 @@
text-transform: uppercase;
font-weight: 600;
grid-column: 1;
grid-row: 1;
// grid-column: 1;
// grid-row: 1;
// margin-bottom: -.5rem;
color: #fff;
display: grid;
grid-template-columns: 1fr;
grid-gap: 10px;
// display: grid;
// grid-template-columns: 1fr;
// grid-gap: 10px;
z-index: 100;
position: absolute;
div{
padding: .02rem .3rem;
position: relative;
float: left;
clear: both;
margin: .1rem 0 .1rem 0;
}
a{
text-decoration: none;

View File

@ -145,6 +145,8 @@
column-gap: 10px;
&>div[id='']{
height: 100%;
font-size: 0;
}