Merge branch 'master' of https://gitlab.waag.org/alain/make-it-open-project-site

wordpress/wp-content/themes/makeitopen/acf-json/group_603c986dd28a4.json

@@ -567,6 +567,27 @@
                                     "return_format": "array"
                                 }
                             ]
+                        },
+                        {
+                            "key": "field_604f97c2a3f8d",
+                            "label": "Background",
+                            "name": "background",
+                            "type": "clone",
+                            "instructions": "",
+                            "required": 0,
+                            "conditional_logic": 0,
+                            "wrapper": {
+                                "width": "",
+                                "class": "",
+                                "id": ""
+                            },
+                            "clone": [
+                                "field_6040ff3b377be"
+                            ],
+                            "display": "seamless",
+                            "layout": "block",
+                            "prefix_label": 0,
+                            "prefix_name": 0
                         }
                     ],
                     "min": "",
@@ -595,5 +616,5 @@
     "hide_on_screen": "",
     "active": true,
     "description": "",
-    "modified": 1615403207
+    "modified": 1615828951
 }
\ No newline at end of file

wordpress/wp-content/themes/makeitopen/assets/js/global.js

@@ -38,6 +38,9 @@
 		$('.menu-item a').each(function() {
 			descenderSpan($(this));
 		});
+		$('.page-header h1').each(function() {
+			descenderSpan($(this));
+		});
 		$('blockquote strong').each(function() {
 			descenderSpan($(this));
 		});

wordpress/wp-content/themes/makeitopen/assets/js/main.min.js

-!function(e){e(document).ready(function(){function t(e){var t={g:!0,j:!0,p:!0,q:!0,y:!0},s=e.html().split("");for(i=0,i=0;i<s.length;i+=1)t[s[i]]&&(s[i]='<span class="descender descender--'+s[i]+'">'+s[i]+"</span>");e.html(s.join(""))}e(window).scroll(function(t){e(window).scrollTop()>200?e(".site-header").addClass("site-header--scrolling"):e(".site-header").removeClass("site-header--scrolling")}),e(".js-toggle-hamburger").click(function(){e(this).toggleClass("hamburger--active"),e(".site-header").toggleClass("site-header--nav-active"),e(".navigation").toggleClass("navigation--shown")}),e(".menu-item a").each(function(){t(e(this))}),e("blockquote strong").each(function(){t(e(this))}),e(".menu-item.osn a").append('<span class="arrow">↗</span>'),e(".archive__filters").on("click",".filter-button",function(){var t=e(this),i=t.attr("data-filter");t.parent().addClass("archive__filters--active"),e(".filter-button").removeClass("filter-button--active"),t.addClass("filter-button--active"),e(".archive__no-results").hide(),e(".list").isotope({filter:i}),e(".list").data("isotope").filteredItems.length||e(".archive__no-results").show()})})}(jQuery);
\ No newline at end of file
+!function(e){e(document).ready(function(){function t(e){var t={g:!0,j:!0,p:!0,q:!0,y:!0},s=e.html().split("");for(i=0,i=0;i<s.length;i+=1)t[s[i]]&&(s[i]='<span class="descender descender--'+s[i]+'">'+s[i]+"</span>");e.html(s.join(""))}e(window).scroll(function(t){e(window).scrollTop()>200?e(".site-header").addClass("site-header--scrolling"):e(".site-header").removeClass("site-header--scrolling")}),e(".js-toggle-hamburger").click(function(){e(this).toggleClass("hamburger--active"),e(".site-header").toggleClass("site-header--nav-active"),e(".navigation").toggleClass("navigation--shown")}),e(".menu-item a").each(function(){t(e(this))}),e(".page-header h1").each(function(){t(e(this))}),e("blockquote strong").each(function(){t(e(this))}),e(".menu-item.osn a").append('<span class="arrow">↗</span>'),e(".archive__filters").on("click",".filter-button",function(){var t=e(this),i=t.attr("data-filter");t.parent().addClass("archive__filters--active"),e(".filter-button").removeClass("filter-button--active"),t.addClass("filter-button--active"),e(".archive__no-results").hide(),e(".list").isotope({filter:i}),e(".list").data("isotope").filteredItems.length||e(".archive__no-results").show()})})}(jQuery);
\ No newline at end of file

wordpress/wp-content/themes/makeitopen/assets/scss/config/_mixins.scss

@@ -31,7 +31,7 @@
 		bottom: -10px;
 		left: 0;
 		mix-blend-mode: multiply;
-    z-index: -1;
+    z-index: -2;
 	}
 
 	&:before {

wordpress/wp-content/themes/makeitopen/assets/scss/elements/_news-teaser.scss

@@ -8,6 +8,7 @@
 		img {
 			mix-blend-mode: multiply;
 			max-width: 100%;
+			z-index: -1;
 		}
 
 		&:hover img {

wordpress/wp-content/themes/makeitopen/assets/scss/global/_base.scss

@@ -37,8 +37,12 @@ body {
 
 	h1 {
 		margin: 0;
-		@include colouredBar($red, $bg-yellow);
+		@include colouredBar($blue, $bg-yellow);
 		text-shadow: -3px 3px #FFF, 3px 3px #FFF;
+
+		.descender:after {
+			bottom: -5px;
+		}
 	}
 }
 

wordpress/wp-content/themes/makeitopen/assets/scss/partials/_content-row.scss

@@ -5,13 +5,6 @@
 		padding: 120px 0;
 	}
 
-	// If this is the first row, make it full height
-	@media only screen and (min-width: $medium) {
-		&[data-index="1"] .container {
-			height: 65vh;
-		}
-	}
-
 	.container>h2 {
 		margin: 0 0 10px;
 		@include colouredBar($green, $blue);
@@ -67,7 +60,7 @@
 
 		.btn {
 			background: $blue;
-			margin: 40px 0 0;
+			margin: 40px 0 2px;
 			@include colourBg($lightblue, 0deg);
 		}
 	}
@@ -98,4 +91,11 @@
 	&--yellow {
 		background: $bg-yellow;
 	}
+}
+
+// If this is the first row, make it full height
+@media only screen and (min-width: $medium) {
+	body.home .content-row[data-index="1"] .container {
+		min-height: 65vh;
+	}
 }
\ No newline at end of file

wordpress/wp-content/themes/makeitopen/assets/scss/partials/_items.scss

@@ -15,19 +15,17 @@
 
 					.img {
 						width: 100%;
+						height: 0;
+						padding-bottom: 100%;
+						position: relative;
 
-						img {
-							width: 100%;
+						&--contain img {
+							object-position: center center;
 						}
 
-						&--cover {
-							height: 0;
-							padding-bottom: 100%;
-							position: relative;
-
-							img {
-								position: absolute;
-							}
+						img {
+							position: absolute;
+							width: 100%;
 						}
 					}
 
@@ -53,17 +51,11 @@
 				.img {
 					@media only screen and (min-width: $medium) {
 						width: 250px;
-
-						&--cover {
-							height: 250px;
-						}
+						height: 250px;
 					}
 					@media only screen and (min-width: $large) {
 						width: 320px;
-
-						&--cover {
-							height: 320px;
-						}
+						height: 320px;
 					}
 				}
 			}
@@ -76,16 +68,21 @@
 		.img {
 			margin-bottom: 20px;
 			width: 160px;
+			height: 160px;
+			overflow: hidden;
 
-			&--cover {
-				height: 160px;
-				overflow: hidden;
+			img {
+				width: 100%;
+				height: 100%;
+			}
 
-				img {
-					width: 100%;
-					height: 100%;
-					object-fit: cover;
-				}
+			&--cover img {
+				object-fit: cover;
+			}
+
+			&--contain img {
+				object-fit: contain;
+				object-position: top center;
 			}
 		}
 
@@ -105,4 +102,11 @@
 			}
 		}
 	}
+
+	// If there are more than 3 items; smaller header font size
+	&--max, {		
+		.item h3 {
+			font-size: 28px;
+		}
+	}
 }
\ No newline at end of file

wordpress/wp-content/themes/makeitopen/assets/scss/templates/_page.scss

+#primary.page {
+	&--get-involved {
+		.page-header h1:before,
+		.text-wrapper a.btn,
+		ol li:before,
+		ul li:before {
+			background: $purple;
+		}
+
+		a.btn:before,
+		ol li:after,
+		ul li:after {
+			background: $bg-yellow;
+		}
+	}
+
+	&--about-us {
+		.page-header h1:before,
+		.text-wrapper a.btn,
+		ol li:before,
+		ul li:before {
+			background: $yellow;
+		}
+
+		a.btn:before,
+		ol li:after,
+		ul li:after {
+			background: $bg-yellow;
+		}
+	}
+}
\ No newline at end of file

wordpress/wp-content/themes/makeitopen/assets/scss/templates/_single.scss

@@ -77,6 +77,7 @@
 				mix-blend-mode: multiply;
 				background: $blue;
 				border-radius: 50%;
+				z-index: -1;
 			}
 
 			&:before {

wordpress/wp-content/themes/makeitopen/assets/scss/templates/all.scss

 @import "archive";
 @import "error";
-@import "single";
\ No newline at end of file
+@import "single";
+@import "page";
\ No newline at end of file

wordpress/wp-content/themes/makeitopen/index.php

 <?php get_header(); ?>
 
-	<main id="primary" class="site-main">
+	<main id="primary" class="site-main page--<?php echo basename(get_the_permalink()); ?>">
 
 			<?php
 			if ( have_posts() ) :

wordpress/wp-content/themes/makeitopen/template-parts/page-builder-rows/items.php

 <?php
 $layout = get_sub_field('layout');
+$background = get_sub_field('background');
+$total_items = count(get_sub_field('items'));
+$amount = ($total_items > 3) ? 'max' : 'min';
 ?>
-<div class="content-row items-row items-row--<?php echo $layout; ?>">
+<div class="content-row items-row items-row--<?php echo $layout; ?> content-row--<?php echo $background; ?> items-row--<?php echo $amount; ?>">
 	<div class="container">
 		<h3><?php the_sub_field('title'); ?></h3>
 		<?php