Explorar o código

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

bach %!s(int64=2) %!d(string=hai) anos
pai
achega
1dff8a0b99

+ 1 - 1
web/profiles/d8-starterkit-profile

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

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
web/themes/custom/popsu/assets/css/styles.min.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
web/themes/custom/popsu/assets/js/main.js


+ 10 - 4
web/themes/custom/popsu/lib/script.js

@@ -79,9 +79,10 @@ $(function(){
 			{
 				breakpoint: 800,
 				settings: {
-					slidesToShow: 2,
+					slidesToShow: 1,
   					slidesToScroll: 1,
-					centerPadding: '0',
+					centerPadding: '40px',
+					centerMode: true,
 				}
 			  }]
 	});
@@ -340,8 +341,13 @@ if($(".page-node-type-programme").length > 0 || $(".page-node-type-projet").leng
 	});
 	let elem = "<div class='main_logo'></div>"
 	
-	if( $("body").hasClass("programme-6") || $("body").hasClass("programme-27") ){
-		$('#projets-block_2').prepend(elem);
+	if( $("body").hasClass("programme-7") || $("body").hasClass("programme-6") || $("body").hasClass("programme-27") ){
+		if(mobile != true){
+			$('#projets-block_2').prepend(elem);
+		}else{
+			$('#projets-block_2').append(elem);
+			$(".main_logo").css("position","relative");
+		}
 	}else{
 		$('#projets-block_2').append(elem);
 		$(".main_logo").css("position","relative")

+ 3 - 0
web/themes/custom/popsu/sass/pages/_programme.scss

@@ -78,6 +78,9 @@
         }
         .slick-track{
             height: 40vw;
+            @include breakpoint(small down) {
+                height: 100%;
+            }
         }
         .slick-slide > div{
             height: 100%;

+ 41 - 1
web/themes/custom/popsu/sass/pages/_ressources.scss

@@ -162,6 +162,7 @@
 					align-self: baseline;
 				}
 				.views-field-field-theme{
+					text-transform: uppercase;
 					grid-row: 7 / span 1;
 					grid-column: 1 / span 2;
 					font-size: $font-small;
@@ -212,6 +213,7 @@
 					
 				}
 				.views-field-field-theme{
+					text-transform: uppercase;
 					.field-content{
 						color:black;
 					}
@@ -239,6 +241,7 @@
 					align-self: baseline;
 				}
 				.views-field-field-theme{
+					text-transform: uppercase;
 					// grid-row: 5 / span 1;
 					// grid-column: 1 / span 2;
 					font-size: $font-small;
@@ -423,6 +426,7 @@
 				align-self: baseline;
 			}
 			.views-field-field-theme{
+				text-transform: uppercase;
 				grid-row: 7 / span 1;
 				grid-column: 1 / span 2;
 				font-size: $font-small;
@@ -471,6 +475,7 @@
 				
 			}
 			.views-field-field-theme{
+				text-transform: uppercase;
 				.field-content{
 					color:black;
 				}
@@ -497,6 +502,7 @@
 				align-self: baseline;
 			}
 			.views-field-field-theme{
+				text-transform: uppercase;
 				// grid-row: 5 / span 1;
 				// grid-column: 1 / span 2;
 				font-size: $font-small;
@@ -603,9 +609,43 @@
 				background: $col-met ;                
 		}
 	}
+	// Copy from themes
+	.block-region-first{
+        // .field_programme{
+        //     display: none;
+        // }
 
-	
+        // #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;
+			}
+        }
 
+    }
+	// Copy from themes end
 	.block-region-second{
 		display: grid;
 		grid-template-columns: repeat(10, 8%);

+ 26 - 0
web/themes/custom/popsu/sass/pages/_themes.scss

@@ -301,6 +301,27 @@
                 }
             }
         }
+        .paragraph--type--equipes{
+            .field_type_equipe{
+                margin: .8rem 0 .3rem 0;
+            }
+        }
+        
+        .paragraph--type--personne{
+            //background-color: red;
+            display: flex;
+            flex-wrap: wrap;
+            .field_nom, .field_prenom{
+                font-weight: 600;
+            }
+           
+            .field_fonction{
+                width: 100%;
+            }
+            .field_nom{
+                margin-left: .2rem;
+            }
+        }
     }
     //end contenus central 
 
@@ -628,6 +649,11 @@
     #node\:title:before{
         content: "ville";
     }
+    #node\:field_ressources_liees{
+        .field_ressources_liees{
+            color:black ;
+        }
+    }
     #node\:field_equipes{
         border-bottom: 3px dotted gray;
         padding: 0 0 1rem 0;

+ 1 - 1
web/themes/custom/popsu/sass/pages/partials/_villes_sidebar.scss

@@ -41,7 +41,7 @@
     .block-region-third{
         background-color: $bck-col;
         .field_evenements_lies, .field_ressources_liees{
-            color: white !important;
+            color: white;
             a{
                 text-decoration: none;
             }

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio