Merge branch 'release/0.3.5'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+## 0.3.5
+- Update JS for Collapsible Control Block to account for .is-closed class being present on pageload.
+- Move border styles in Collapsible block to inner child elements instead of block container element.
+
 ## 0.3.4
 - Add icons for each block to improve UI and accessibility.
 - Add Collapsible Block
@@ -153,4 +159,3 @@ stylesheet via the child theme. This fixes the block styling when BU-Blocks is a
 
 Updates the master branch with the currently released codebase in production that had been developed on the #develop branch initially.
 
-## Unreleased

bu-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      http://www.bu.edu/interactive-design/
  * Text Domain:     bu-blocks
  * Domain Path:     /languages
- * Version:         0.3.4
+ * Version:         0.3.5
  *
  * @package         BU_Blocks
  */
@@ -20,7 +20,7 @@
 }
 
 // Defines the plugin version.
-define( 'BU_BLOCKS_VERSION', '0.3.4' );
+define( 'BU_BLOCKS_VERSION', '0.3.5' );
 
 /**
  * Displays admin notice and prevents activation.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bu-blocks",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "private": true,
   "main": "Gruntfile.js",
   "author": "Boston University: Interactive Design",

src/blocks/collapsible-control/frontend.js

@@ -5,6 +5,7 @@ bu_blocks.collapsibleControl = ( function() {
 	var allCollapsibleBlocks = [];
 	var allBlocksOpen = false;
 	var collapsibleOpenClass = 'is-open';
+	var collapsibleCloseClass = 'is-closed';
 
 	/**
 	 * Open or close a group of collapsible blocks
@@ -25,10 +26,12 @@ bu_blocks.collapsibleControl = ( function() {
 
 			if ( open ) {
 				container.classList.add( collapsibleOpenClass );
+				container.classList.remove( collapsibleCloseClass );
 				toggle.setAttribute( 'aria-expanded', true );
 				panel.setAttribute( 'aria-hidden', false );
 			} else {
 				container.classList.remove( collapsibleOpenClass );
+				container.classList.add( collapsibleCloseClass );
 				toggle.setAttribute( 'aria-expanded', false );
 				panel.setAttribute( 'aria-hidden', true );
 			}

src/blocks/collapsible/_bu-blocks-block-collapsible-base.scss

@@ -9,12 +9,13 @@
 //
 
 .wp-block-bu-collapsible {
-	border: 1px solid #ccc;
 	margin-top: -1px;
 
 	.bu-block-collapsible-content {
 		display: none;
 		padding: 20px;
+		border: 1px solid #ccc;
+		border-top: 0;
 	}
 
 	.bu-block-collapsible-toggle {
@@ -33,6 +34,7 @@
 	.bu-collapsible-heading {
 		padding: 0;
 		position: relative;
+		border: 1px solid #ccc;
 		@include icon( 'plus', 'after' );
 
 		&:after {
@@ -113,10 +115,17 @@
 
 	// Outline Style.
 	&.is-style-outline {
-		border: 3px solid #000;
+		.bu-collapsible-heading {
+			border: 3px solid #000;
+		}
 
 		// Remove top border when collapsible is adjacent.
-		& + .is-style-outline {
+		& + .is-style-outline .bu-collapsible-heading {
+			border-top: 0;
+		}
+
+		.bu-block-collapsible-content {
+			border: 3px solid #000;
 			border-top: 0;
 		}
 
@@ -142,12 +151,14 @@
 		}
 
 		.bu-collapsible-heading {
+			border: none;
 			position: static;
 			flex: 0 1 auto;
 			align-self: stretch;
 		}
 
 		.bu-block-collapsible-content {
+			border: none;
 			padding: 0;
 			flex: 0 1 auto;
 			align-self: stretch;