Browse Source

carte + ajustement home

armansansd 4 years ago
parent
commit
81551ee4a8

+ 76 - 12
web/themes/custom/popsu/css/styles.css

@@ -1150,7 +1150,7 @@ table {
   font-style: italic; }
 
 body {
-  font-family: "trueno";
+  font-family: "trueno" !important;
   font-size: 0.6rem;
   font-weight: 300;
   line-height: 1.5; }
@@ -1214,6 +1214,56 @@ iframe {
   -ms-transform: rotate(180deg);
   transform: rotate(180deg); }
 
+.leaflet-marker-icon a {
+  text-decoration: none;
+  color: white;
+  display: block;
+  padding: .4rem;
+  font-weight: 600;
+  font-size: 0;
+  border-radius: 50%;
+  transition: all 250ms; }
+  .leaflet-marker-icon a:hover {
+    background: white;
+    font-size: 0.45rem;
+    transition: all 250ms;
+    border-radius: 0; }
+
+.leaflet-marker-icon .programme-1 {
+  background: #4dabc1; }
+  .leaflet-marker-icon .programme-1:hover {
+    color: #4dabc1; }
+
+.leaflet-marker-icon .programme-2 {
+  background: #61ab32; }
+  .leaflet-marker-icon .programme-2:hover {
+    color: #61ab32; }
+
+.leaflet-marker-icon .programme-3 {
+  background: #646578; }
+  .leaflet-marker-icon .programme-3:hover {
+    color: #646578; }
+
+.leaflet-marker-icon .programme-4 {
+  background: black; }
+  .leaflet-marker-icon .programme-4:hover {
+    color: black; }
+
+.leaflet-marker-icon .programme-5 {
+  background: #ab9569; }
+  .leaflet-marker-icon .programme-5:hover {
+    color: #ab9569; }
+
+.leaflet-marker-icon .programme-6 {
+  background: #e01a35; }
+  .leaflet-marker-icon .programme-6:hover {
+    color: #e01a35; }
+
+.leaflet-marker-icon .programme-7 {
+  background: #28429f; }
+  .leaflet-marker-icon .programme-7:hover {
+    color: #28429f; }
+
 .layout--threecol-25-50-25 {
   display: grid;
   grid-template-columns: 20% minmax(0, 1fr) 20%;
@@ -1482,6 +1532,9 @@ footer {
       color: transparent;
       background: left/contain no-repeat url(../images/yt.svg); }
 
+.path-frontpage .header_top_left_container div:nth-child(2) img {
+  width: 77%; }
+
 .path-frontpage .block-region-content {
   display: grid;
   grid-template-columns: repeat(3, minmax(0, 1fr));
@@ -1558,7 +1611,6 @@ footer {
     margin-left: 1rem;
     color: white;
     align-self: flex-start;
-    grid-column: 1;
     grid-auto-rows: min-content;
     font-size: 0.6rem;
     text-transform: uppercase; }
@@ -1696,7 +1748,7 @@ footer {
       color: black;
       background: white; }
 
-#villes-block_1 header, #home_themes-block_1 header, #programmes-block_4 header {
+#projets-block_1 header, #home_themes-block_1 header, #programmes-block_4 header {
   display: none; }
 
 .header_container {
@@ -1881,25 +1933,28 @@ footer {
     padding: 1rem;
     background-clip: content-box; }
   #home_blocks-block_3 .last-ressources .views-field-field-image {
-    grid-row: 3 / span 2;
+    grid-row: 3 / span 3;
     z-index: 0;
-    padding: .5rem; }
+    padding: .5rem;
+    margin-top: -1.3rem; }
   #home_blocks-block_3 .last-ressources .views-field:not(.views-field-field-image) {
     background: transparent;
     width: auto;
     margin-left: 0;
     padding-left: 0;
-    color: black;
-    grid-column: 2 / span 1; }
+    color: black; }
   #home_blocks-block_3 .last-ressources .views-field-title-1, #home_blocks-block_3 .last-ressources .views-field-title {
     font-weight: 400;
     grid-row: 3 / span 1;
+    grid-column: 2;
     font-style: italic; }
   #home_blocks-block_3 .last-ressources .views-field-field-auteurs {
-    grid-row: 3 / span 1;
-    font-weight: 600; }
+    grid-row: 2 / span 1;
+    font-weight: 600;
+    grid-column: 2; }
   #home_blocks-block_3 .last-ressources .views-field-field-edition {
-    grid-row: 5; }
+    grid-row: 4;
+    grid-column: 2; }
   #home_blocks-block_3 .last-ressources .views-field-field-programme {
     padding-left: .5rem !important;
     grid-row: 1 / span 1;
@@ -3119,10 +3174,19 @@ article p, .paragraph p {
   background: #28429f; }
 
 .page-node-type-theme .block-region-first, .page-node-type-projet .block-region-first {
-  visibility: hidden; }
+  padding: 1rem; }
+  .page-node-type-theme .block-region-first .field_programme, .page-node-type-projet .block-region-first .field_programme {
+    background: black !important;
+    font-weight: 600; }
+    .page-node-type-theme .block-region-first .field_programme a, .page-node-type-projet .block-region-first .field_programme a {
+      text-decoration: none; }
+      .page-node-type-theme .block-region-first .field_programme a:hover, .page-node-type-projet .block-region-first .field_programme a:hover {
+        text-decoration: underline; }
 
 .page-node-type-theme .block-region-third, .page-node-type-projet .block-region-third {
   margin-top: 30rem; }
+  .page-node-type-theme .block-region-third #node\:field_equipes, .page-node-type-projet .block-region-third #node\:field_equipes {
+    visibility: hidden; }
 
 .page-node-type-theme .block-region-second #node\:title:before, .page-node-type-projet .block-region-second #node\:title:before {
   clear: both;
@@ -3331,7 +3395,7 @@ article p, .paragraph p {
 .page-node-type-theme.programme-7 .block-region-second h2, .page-node-type-theme.programme-7 .block-region-second h3, .page-node-type-theme.programme-7 .block-region-second h4, .page-node-type-theme.programme-7 .block-region-second h5, .page-node-type-theme.programme-7 .block-region-second h6, .page-node-type-theme.programme-7 .block-region-second .field_titre, .page-node-type-projet.programme-7 .block-region-second h2, .page-node-type-projet.programme-7 .block-region-second h3, .page-node-type-projet.programme-7 .block-region-second h4, .page-node-type-projet.programme-7 .block-region-second h5, .page-node-type-projet.programme-7 .block-region-second h6, .page-node-type-projet.programme-7 .block-region-second .field_titre {
   color: #28429f; }
 
-.page-node-type-theme .computed_projets_references, .page-node-type-theme .computed_themes_references, .page-node-type-theme .field_logo, .page-node-type-projet .computed_projets_references, .page-node-type-projet .computed_themes_references, .page-node-type-projet .field_logo {
+.page-node-type-theme .computed_projets_references, .page-node-type-theme .computed_themes_references, .page-node-type-projet .computed_projets_references, .page-node-type-projet .computed_themes_references {
   display: none; }
 
 .page-node-type-projet #node\:title:before {

File diff suppressed because it is too large
+ 0 - 0
web/themes/custom/popsu/css/styles.css.map


File diff suppressed because it is too large
+ 0 - 0
web/themes/custom/popsu/js/main.js


+ 7 - 3
web/themes/custom/popsu/lib/script.js

@@ -101,7 +101,7 @@ $(function(){
 			$('.header_container').find("header .arrow").remove();
 			$(this).append('<span class="arrow"><br>▼</span>');
 			$(this).toggleClass('active');
-			var containers_id  = ["villes-block_1","programmes-block_4","home_themes-block_1"];
+			var containers_id  = ["projets-block_1","programmes-block_4","home_themes-block_1"];
 			containers_id.forEach((element) => {
 				$("#"+element).fadeOut();
 			});
@@ -215,9 +215,13 @@ $(function(){
 		  
 	});
 	
-//// PAGE POPSU ////
-// projets-block_2
+//// PAGE POPSU //// 
+
 if($(".page-node-type-programme").length > 0 || $(".page-node-type-projet").length > 0 || $(".page-node-type-theme").length > 0){
+	$('.views-element-container header').click(function(){
+		$(this).parent().find(".views-row").fadeToggle();
+	})
+	
 	$(".body").append('<footer><a class="more">Lire la suite</a></footer>');
 
 	let elem = "<div class='main_logo'></div>"

+ 18 - 9
web/themes/custom/popsu/sass/pages/_home.scss

@@ -1,5 +1,12 @@
 .path-frontpage{
-
+	.header_top_left_container{
+		
+		div:nth-child(2){
+			img{
+				width: 77%;
+			}
+		}
+	}
 	.block-region-content{
 		display: grid;
 		grid-template-columns: repeat(3, minmax(0,1fr));
@@ -108,7 +115,7 @@
 		margin-left: 1rem;
 		color: white;
 		align-self: flex-start;
-		grid-column: 1;
+		// grid-column: 1;
 		grid-auto-rows: min-content;
 
 		font-size: $font-normal;
@@ -140,7 +147,7 @@
 	}
 
 }
-
+// general à deplacer
 .last-ressources{
 	.views-field{
 		color: black;
@@ -322,7 +329,7 @@
 	}
 	
 }
-#villes-block_1, #home_themes-block_1, #programmes-block_4{
+#projets-block_1, #home_themes-block_1, #programmes-block_4{
 	header{
 		display: none;
 	}
@@ -608,10 +615,11 @@
 			background-clip: content-box;
 		}
 		.views-field-field-image{
-			grid-row: 3 / span 2;
+			grid-row: 3 / span 3;
 			// margin-top: -1.5rem;
 			z-index: 0;	
 			padding: .5rem;
+			margin-top: -1.3rem;
 		}
 		.views-field:not(.views-field-field-image){
 			background: transparent;
@@ -619,23 +627,24 @@
 			margin-left: 0;
 			padding-left: 0;
 			color: black;
-			grid-column: 2 / span 1;
 			
 		}
 		.views-field-title-1,.views-field-title{
 			font-weight: 400;
 			grid-row: 3 / span 1;
-			
+			grid-column: 2;
 			font-style: italic;
 			
 		}
 		.views-field-field-auteurs{
-			grid-row: 3 / span 1;
+			grid-row:  2 / span 1;
 			font-weight: 600;
+			grid-column: 2;
 			
 		}
 		.views-field-field-edition{
-			grid-row: 5;
+			grid-row: 4;
+			grid-column: 2;
 			
 		}
 		

+ 16 - 2
web/themes/custom/popsu/sass/pages/_themes.scss

@@ -41,11 +41,25 @@
     }
     //tmp hidden
     .block-region-first{
-        visibility: hidden;
+        padding: 1rem;
+        .field_programme{
+            background: black !important;
+            font-weight: 600;
+            
+            a{
+                text-decoration: none;
+            &:hover{
+                text-decoration: underline;
+            }
+            }
+        }
     }
 
     .block-region-third{
         margin-top: 30rem;
+        #node\:field_equipes{
+            visibility: hidden;
+        }
     }
     .block-region-second{
         #node\:title:before{
@@ -351,7 +365,7 @@
 
     // font-size: $font-small;
     //temp hidden 
-    .computed_projets_references, .computed_themes_references, .field_logo{
+    .computed_projets_references, .computed_themes_references{
         display: none;
     }
     

+ 2 - 0
web/themes/custom/popsu/sass/pages/partials/_header_footer.scss

@@ -146,6 +146,8 @@
 	&>div[id='']{
 		height: 100%;
 	}
+	
+	
 	a[rel~='home']{
 		//display: none;
 		height: 100%;

+ 67 - 1
web/themes/custom/popsu/sass/setup/_globals.scss

@@ -1,5 +1,5 @@
 body{
-	font-family: "trueno";
+	font-family: "trueno" !important;
 	font-size: $font-normal ;
 	font-weight: 300;
 	line-height: 1.5;
@@ -112,4 +112,70 @@ iframe{
     -o-transform: rotate(180deg);
     -ms-transform: rotate(180deg);
     transform: rotate(180deg);
+}
+
+
+//map 
+
+.leaflet-marker-icon{
+	
+	// padding: .5rem;
+	a{
+		text-decoration: none;
+		color: white;display: block;
+		padding: .4rem;
+		font-weight: 600;
+		font-size: 0;
+		border-radius: 50%;
+		transition: all 250ms;
+		&:hover{
+			background: white;
+			font-size: $font-small;
+			transition: all 250ms;
+			border-radius: 0;
+		}
+	}
+	.programme-1{
+		background: $col-1;
+		&:hover{
+			color: $col-1;
+		}
+	}
+	.programme-2{
+		background: $col-2;
+		&:hover{
+			color: $col-2;
+		}
+	}
+	.programme-3{
+		background: $col-eur;
+		&:hover{
+			color: $col-eur;
+		}
+	}
+	.programme-4{
+		background: black;
+		&:hover{
+			color: black;
+		}
+	}
+	.programme-5{
+		background: $col-mond;
+		&:hover{
+			color: $col-mond;
+		}
+	}
+	.programme-6{
+		background: $col-ter;
+		&:hover{
+			color: $col-ter;
+		}
+	}
+	.programme-7{
+		background: $col-met;
+		&:hover{
+			color: $col-met;
+		}
+	}
+	
 }

Some files were not shown because too many files changed in this diff