Fix margin reset for gutenberg editor, release 8.3.5

digitoimistodude · Mar 25, 2022 · 5969187 · 5969187
1 parent a2b7d8c
commit 5969187
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 8.3.5: 2022-03-25
+
+* Fix: Margin reset breaks article blocks in editor, limit it for ACF blocks only
+
 ### 8.3.4: 2022-03-16
 
 * Make edit-post-visual-editor__post-title-wrapper background to match WordPress brand color

diff --git a/bin/tasks/additions.sh b/bin/tasks/additions.sh
@@ -2,15 +2,15 @@
 # @Author: Roni Laukkarinen
 # @Date:   2021-05-21 14:40:29
 # @Last Modified by:   Roni Laukkarinen
-# @Last Modified time: 2022-03-16 15:37:35
+# @Last Modified time: 2022-03-25 12:17:11
 echo "${YELLOW}Adding media library folder...${TXTRESET}"
 mkdir -p ${PROJECT_PATH}/media
 echo "" > ${PROJECT_PATH}/media/index.php
 chmod 777 ${PROJECT_PATH}/media
 
 echo "${YELLOW}Generating default README.md...${TXTRESET}"
 
-NEWEST_AIR_VERSION="8.3.4"
+NEWEST_AIR_VERSION="8.3.5"
 NEWEST_WORDPRESS_VERSION="5.9.2"
 NEWEST_PHP_VERSION="7.4"
 CURRENT_DATE=$(LC_TIME=en_US date '+%d %b %Y' |tr ' ' '_');

diff --git a/css/dev/gutenberg-editor-styles.css b/css/dev/gutenberg-editor-styles.css
diff --git a/css/prod/gutenberg-editor-styles.css b/css/prod/gutenberg-editor-styles.css
diff --git a/functions.php b/functions.php
@@ -7,7 +7,7 @@
  *
  * @Date: 2019-10-15 12:30:02
  * @Last Modified by:   Roni Laukkarinen
- * @Last Modified time: 2022-03-16 15:36:35
+ * @Last Modified time: 2022-03-25 12:17:05
  *
  * @package air-light
  */
@@ -17,7 +17,7 @@
 /**
  * The current version of the theme.
  */
-define( 'AIR_LIGHT_VERSION', '8.3.4' );
+define( 'AIR_LIGHT_VERSION', '8.3.5' );
 
 // We need to have some defaults as comments or empties so let's allow this:
 // phpcs:disable Squiz.Commenting.InlineComment.SpacingBefore, WordPress.Arrays.ArrayDeclarationSpacing.SpaceInEmptyArray

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "air-light",
-  "version": "8.3.4",
+  "version": "8.3.5",
   "description": "A minimalist WordPress starter theme.",
   "author": "Digitoimisto Dude Oy ([email protected])",
   "devDependencies": {

diff --git a/readme.txt b/readme.txt
@@ -12,7 +12,7 @@ Tags: one-column, accessibility-ready, translation-ready
 
 Requires at least: 5.9
 Tested up to: 5.9.2
-Stable tag: 8.3.4
+Stable tag: 8.3.5
 License: MIT License
 License URI: https://opensource.org/licenses/MIT
 

diff --git a/sass/gutenberg-editor-styles.scss b/sass/gutenberg-editor-styles.scss
@@ -155,10 +155,6 @@
 .is-root-container > .wp-block {
   font-family: var(--font-paragraph);
 
-  // Reset 28px gap that comes from wp-includes/css/dist/edit-post/classic.css
-  margin-bottom: 0;
-  margin-top: 0;
-
   // Let's use maximum article width on article content
   max-width: $width-max-article;
 
@@ -182,9 +178,13 @@
   }
 }
 
-// Allow ACF blocks to be full width by default
 // stylelint-disable-next-line selector-attribute-quotes
 .wp-block[data-type^=acf] {
+  // Reset 28px gap that comes from wp-includes/css/dist/edit-post/classic.css
+  margin-bottom: 0;
+  margin-top: 0;
+
+  // Allow ACF blocks to be full width by default
   max-width: 100%;
 }
 

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://github.com/digitoimistodude/air-light
 Author: Digitoimisto Dude Oy
 Author URI: https://www.dude.fi
 Description: Hi. I'm a starter theme called <code>Air-light</code>, or <em>air</em>, if you like. I'm a theme based on Automattic's underscores and I'm meant for hacking so don't use me as a <em>Parent Theme</em> as-is. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for.
-Version: 8.3.4
+Version: 8.3.5
 
 ------8<----------
 Please do this before your actual theme is ready to go live:
@@ -20,7 +20,7 @@ If you see this, contact the site admin.
 /*---------------------------------------------------------------
 >>> Air-light theme version information, only for AIR developers
 -----------------------------------------------------------------
-@version 2022-03-16
+@version 2022-03-25
 @since 2016-01-28
 
 Tested up to: 5.9.2