v1.2.0 (#394)

CHANGELOG.md

@@ -1,3 +1,19 @@
+### v1.2.0
+Features:
+- Add Call to Action block patterns
+- Add Audio/Quote block patterns
+
+Fixes:
+- Rendering issue in README.md
+- Missing spacing above Blockquote block
+- Layout of Latest Posts block in Sidebars
+- Erroneous whitespace below Hero block
+
+Chores:
+- Move deprecated blocks to correct directory
+- Bump Webpack version
+- Bump Micromatch version
+
 ### v1.1.2
 Fixes:
 - Add missing viewport meta tags

README.md

@@ -42,7 +42,7 @@ The [Media Copyright](https://github.com/amnestywebsite/media-copyright) plugin
 The quickest way to get started using the theme is to download the zip of the [latest release](https://github.com/amnestywebsite/humanity-theme/releases/latest), and install it via upload directly within WP Admin -> Themes.  
 We recommend your site be configured as a [multisite](https://wordpress.org/support/article/create-a-network/), both for future-proofing, and for more granular user permissions control. Many of the theme's customisation options make more sense at the network-level, too.
 
-## ## Governance
+## Governance
 See [GOVERNANCE.md](GOVERNANCE.md) for project governance information.  
 
 ## Changelog  

private/package.json

@@ -65,7 +65,7 @@
     "stylelint-scss": "^5.3.1",
     "stylelint-webpack-plugin": "^4.1.1",
     "typescript": "^5.3.2",
-    "webpack": "^5.76.0",
+    "webpack": "^5.94.0",
     "webpack-cli": "^5.0.0"
   },
   "dependencies": {

private/src/scripts/blocks.js

@@ -15,19 +15,10 @@ import './editor/block-styles';
 import './editor/plugins/appearance-options/index.jsx';
 import './editor/plugins/pop-in/index.jsx';
 
-import './editor/blocks-deprecated/banner/index.jsx';
-import './editor/blocks-deprecated/header/index.jsx';
-
 import './editor/blocks/action/index.jsx';
-import './editor/blocks/background-media/index.jsx';
 import './editor/blocks/blockquote/index.jsx';
-import './editor/blocks/button/index.jsx';
-import './editor/blocks/call-to-action/index.jsx';
-import './editor/blocks/collapsable/index.jsx';
-import './editor/blocks/columns/index.jsx';
 import './editor/blocks/core-mods';
 import './editor/blocks/countdown-timer/index.jsx';
-import './editor/blocks/custom-card/index.jsx';
 import './editor/blocks/download/index.jsx';
 import './editor/blocks/embed-flourish/index.jsx';
 import './editor/blocks/embed-infogram/index.jsx';
@@ -37,10 +28,8 @@ import './editor/blocks/hero/index.jsx';
 import './editor/blocks/hero/replaceHeaders';
 import './editor/blocks/iframe-button/index.jsx';
 import './editor/blocks/iframe/index.jsx';
-import './editor/blocks/image/index.jsx';
 import './editor/blocks/key-facts/index.jsx';
 import './editor/blocks/link-group/index.jsx';
-import './editor/blocks/links-with-icons/index.jsx';
 import './editor/blocks/menu/index.jsx';
 import './editor/blocks/petition-list/index.jsx';
 import './editor/blocks/post-list/index.jsx';
@@ -55,3 +44,15 @@ import './editor/blocks/tweet/index.jsx';
 
 import './editor/fse-blocks/pop-in/index.jsx';
 import './editor/fse-blocks/site-header/index.jsx';
+
+// To remove in v2.0.0
+import './editor/blocks-deprecated/background-media/index.jsx';
+import './editor/blocks-deprecated/banner/index.jsx';
+import './editor/blocks-deprecated/button/index.jsx';
+import './editor/blocks-deprecated/call-to-action/index.jsx';
+import './editor/blocks-deprecated/collapsable/index.jsx';
+import './editor/blocks-deprecated/columns/index.jsx';
+import './editor/blocks-deprecated/custom-card/index.jsx';
+import './editor/blocks-deprecated/header/index.jsx';
+import './editor/blocks-deprecated/image/index.jsx';
+import './editor/blocks-deprecated/links-with-icons/index.jsx';

private/src/scripts/editor/block-styles/group-block.js

@@ -6,3 +6,21 @@ registerBlockStyle('core/group', {
   // translators: [admin]
   label: _x('Square Border', 'block style', 'amnesty'),
 });
+
+registerBlockStyle('core/group', {
+  name: 'light',
+  // translators: [admin]
+  label: _x('Light Background', 'block style', 'amnesty'),
+});
+
+registerBlockStyle('core/group', {
+  name: 'dark',
+  // translators: [admin]
+  label: _x('Dark Background', 'block style', 'amnesty'),
+});
+
+registerBlockStyle('core/group', {
+  name: 'top-and-bottom-border',
+  // translators: [admin]
+  label: _x('Top and Bottom Border', 'block style', 'amnesty'),
+});

private/src/scripts/editor/blocks/call-to-action/index.jsx → private/src/scripts/editor/blocks-deprecated/call-to-action/index.jsx

@@ -15,6 +15,7 @@ registerBlockType('amnesty-core/block-call-to-action', {
   keywords: [__('Call To Action', 'amnesty')],
   supports: {
     className: false,
+    inserter: false,
     multiple: true,
   },
   attributes: {

private/src/scripts/editor/blocks/custom-card/index.jsx → private/src/scripts/editor/blocks-deprecated/custom-card/index.jsx

@@ -48,8 +48,9 @@ registerBlockType('amnesty-core/custom-card', {
   icon: 'megaphone',
   category: 'amnesty-core',
   supports: {
-    className: false,
     align: true,
+    className: false,
+    inserter: false,
   },
   attributes: blockAttributes,
   styles: [

private/src/scripts/editor/blocks/image/index.jsx → private/src/scripts/editor/blocks-deprecated/image/index.jsx

@@ -65,6 +65,7 @@ registerBlockType('amnesty-core/image-block', {
   category: 'amnesty-core',
   supports: {
     className: false,
+    inserter: false,
   },
   attributes: blockAttributes,
 

private/src/styles/app.scss

@@ -111,6 +111,7 @@
 
 // Block patterns
 @import "block-patterns/social-share";
+@import "block-patterns/group";
 
 // Pages
 @import "pages/404";

private/src/styles/block-patterns/_group.scss

@@ -0,0 +1,62 @@
+.wp-block-group.custom-card {
+  max-width: 350px !important;
+
+  .wp-block-buttons {
+    padding-left: 8px;
+    padding-right: 8px;
+  }
+
+  .wp-block-buttons,
+  .wp-block-button,
+  .wp-block-button__link {
+    width: 100%;
+  }
+
+  .wp-block-heading {
+    text-transform: uppercase;
+    font-size: 1.5rem;
+  }
+
+  p {
+    font-size: 1rem;
+    padding: 10px 10px 0 10px;
+  }
+
+  .wp-element-caption {
+    padding: 0 10px;
+  }
+}
+
+.wp-block-group.custom-card.alignfull {
+  max-width: 480px !important;
+}
+
+.wp-block-group.is-style-light {
+  background-color: var(--wp--preset--color--amnesty-grey-x-light);
+  color: var(--wp--preset--color--black);
+}
+
+.wp-block-group.is-style-dark {
+  background-color: var(--wp--preset--color--amnesty-grey-mid-dark);
+  color: var(--wp--preset--color--white);
+
+  .wp-block-heading,
+  .wp-element-caption {
+    color: var(--wp--preset--color--white);
+  }
+}
+
+.wp-block-group.call-to-action {
+  margin-top: 40px;
+  padding: 20px;
+  text-align: center;
+
+  @include mq(small) {
+    padding: 36px 32px;
+  }
+}
+
+.wp-block-group.is-style-top-and-bottom-border {
+  border-top: 7px solid var(--wp--preset--color--black);
+  border-bottom: 7px solid var(--wp--preset--color--black);
+}

private/src/styles/blocks/core-blocks/_blockquote.scss

@@ -6,7 +6,7 @@
 blockquote,
 .blockquote {
   position: relative;
-  margin: 70px auto 24px;
+  margin: 70px auto 24px !important;
   font-family: var(--wp--preset--font-family--secondary);
   text-align: center;
 

private/src/styles/blocks/core-blocks/_latest-posts.scss

@@ -1,7 +1,7 @@
 .wp-block-latest-posts.wp-block-latest-posts__list {
   background-color: $color-grey-light;
   margin-left: 0;
-  padding: 24px;
+  padding: 24px !important;
   width: 100%;
 }
 

private/src/styles/gutenberg.scss

@@ -108,6 +108,7 @@
 
 // Block Patterns
 @import "block-patterns/social-share";
+@import "block-patterns/group";
 
 :root {
   --ms-base: 16;