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

web/themes/custom/popsu/lib/script.js

@@ -230,10 +230,12 @@ if($(".page-node-type-programme").length > 0 || $(".page-node-type-projet").leng
 	});
 	if(hb < ttp + 30){
 		$(".block-region-second .body").append('<footer><a class="more">Lire la suite</a></footer>');
+	}else{
+		$(".block-region-second .body").addClass("body_open");	
 	}
 	//reteste on windows resize 
 	window.addEventListener('resize', function(){
-		
+		$(".block-region-second .body").removeClass("body_open");
 		let hb = $(".block-region-second .body").height();
 		let ttp = 0;
 		$(".block-region-second .body p").each(function(){
@@ -248,7 +250,9 @@ if($(".page-node-type-programme").length > 0 || $(".page-node-type-projet").leng
 		}else{
 			if($(".block-region-second .body footer").length > 0){
 				$(".block-region-second .body footer").remove();
-			}		
+				
+			}
+			$(".block-region-second .body").addClass("body_open");	
 		}
 		
 	});
@@ -262,8 +266,18 @@ if($(".page-node-type-programme").length > 0 || $(".page-node-type-projet").leng
 		$(this).toggleClass("rotate");
 
 	});
+	$(".field_equipes").parent().find("h2").on("click",  function(){
+		
+		$(this).toggleClass("rotate");
+		if($(".field_equipes").is(":visible")){
+			$(".field_equipes").fadeOut("slow");
+		}else{
+			$(".field_equipes").fadeIn("slow");
+		}
+
+	})
 
-	$(".more").on("click", function(){
+	$(".block-region-second .body").on("click", ".more", function(){
 		
 
 		$(".body").toggleClass("body_open");

web/themes/custom/popsu/sass/pages/_home.scss

@@ -19,7 +19,7 @@
 
 	.header_top_left_container{
 		a[rel~="home"]{
-			display: none;
+			// display: none;
 		}
 	}
 }

web/themes/custom/popsu/sass/pages/_ressources.scss

@@ -337,14 +337,22 @@
 			// background-clip: content-box;
 			width: 100% !important;
 			padding: .3rem;
+
+			// .views-field:empty {
+			// 	background: lime;
+			// }
+
 			.views-field:not(:first-child){
 				padding: 0 0 0 .4rem;
 			}
 			.views-field-field-image{
-				grid-row: 3 / span 2;
+				grid-row: 4 / span 2;
 				margin-top: -1.5rem;				
 			}
-
+			.views-field-field-edition{
+				grid-column: 2;
+				grid-row: 6;
+			}
 			.views-field-field-auteurs{
 				font-weight: 600;
 				grid-column: 2;
@@ -364,11 +372,7 @@
 				}
 				
 			}
-			.views-field-field-theme{
-				.field-content{
-					color:black;
-				}
-			}
+			
 			.views-field-field-type-de-ressource{
 				text-transform: uppercase;
 				font-weight: 600;
@@ -391,9 +395,12 @@
 				align-self: baseline;
 			}
 			.views-field-field-theme{
-				grid-row: 6 / span 1;
+				grid-row: 7 / span 1;
 				grid-column: 1 / span 2;
 				font-size: $font-small;
+				.field-content{
+					color:black;
+				}
 
 			}
 		}
@@ -470,9 +477,20 @@
 
 		
 
+	}
+	nav{
+		display: grid;
+		align-items: center;
+		justify-items: center;
 	}
 	
 	.js-pager__items{
 		text-align: center;
+		
+		li{
+			display: inline-block;
+			float: left;
+			margin: 0 .2rem;
+		}
 	}
 }

web/themes/custom/popsu/sass/pages/_themes.scss

@@ -141,16 +141,17 @@
                 }
             }
         }
+
         .body:after{
             content: "";
             opacity: 1;
             position: absolute;
             top: 0; bottom: 0; left: -15px; right: -15px;
-            box-shadow: inset white 0 -4rem 2rem;
+            box-shadow: inset white 0 -2rem 2rem;
         }
         .body_open{
-            height: auto;
-            padding: 0 0 3rem 0;
+            height: auto !important;
+            padding: 0 0 .8rem 0;
             &:after{
                 opacity: 0;
                 -webkit-transition: all 250ms ease;
@@ -163,6 +164,9 @@
             -o-transition: all 250ms ease;
             transition: all 250ms ease;
         }
+        .body_open:after{
+            display: none;
+        }
         .field_textes{
           
             .paragraph{
@@ -245,15 +249,37 @@
     }
 
 
-    //équipe tmp 
-
+   
     #node\:field_equipes{
         margin-top: 1rem;
         h2{
+            cursor: pointer;
             color: black;
-            text-align: center;
+            display: grid;
+            grid-template-columns: 95% 5%;
+            align-content: center;
+            // 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{
@@ -262,10 +288,15 @@
                         display: none;
                     }
                     .paragraph{
-                        display: block !important;
+                        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;
                             }
@@ -275,7 +306,10 @@
                             }
                         }
                         .field_prenom{
+                            grid-column: 1;
+                            grid-row: 1;
                             display: inline-block;
+                            font-weight: 500;
                             >div:first-child{
                                 display: none;
                             }
@@ -285,6 +319,7 @@
                             }
                         }
                         .field_fonction{
+                            grid-column: 1 / span 2;
                             >div:first-child{
                                 display: none;
                             }
@@ -305,6 +340,33 @@
             }
         }
     }
+    #node\:field_partenaires{
+        h2{
+            color: black;
+        }
+        .field_partenaires{
+            .paragraph{
+                display: grid;
+                align-items: center;
+                justify-items: center;
+                grid-template-columns: 40% 60%;
+                .field_logo_partenaire{
+                    div:first-child{
+                        display: none;
+                    }
+                    grid-column: 1;
+                    grid-row: 1;
+                }
+                .field_nom_partenaire{
+                    div:first-child{
+                        display: none;
+                    }
+                    grid-column: 2;
+                    grid-row: 1;
+                }
+            }
+        }
+    }
 
 &.programme-1{
     .block-region-second{
@@ -388,8 +450,12 @@
         h2{
             color: white !important;
             text-align: left !important;
+            cursor: pointer;
             
         }
+        h2:after{
+
+        }
         
     }
     .field_projets_lies{

web/themes/custom/popsu/sass/pages/partials/_header_footer.scss

@@ -179,7 +179,7 @@
 	}
 
 	.views-row{
-		text-align: center;
+		// text-align: center;
 		display: inline-block;
 		width: auto;
         // a, span{
@@ -195,6 +195,10 @@
 			a{
 				text-decoration: none;
 			}
+			@include breakpoint(1222px down) {
+				font-size: $font-small;
+		
+			}
         }
 
         

web/themes/custom/popsu/sass/setup/_variables.scss

@@ -9,8 +9,8 @@ $col-met: #28429f;
 $col-eur: #646578;
 $col-mond: #ab9569;
 $col-ter: #e01a35; 
-$col-1: #4dabc1;
-$col-2: #61ab32; 
+$col-2: #4dabc1; //popsu 1 : programme 2 ?
+$col-1: #61ab32; 
 
 $bck-col: #eff2f9;
 $lightblue: #98d0d9;