1.4.1

webmandesign · Nov 9, 2022 · 60b9523 · 60b9523
1 parent 98833d3
commit 60b9523
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 103 deletions.
diff --git a/assets/css/blocks-rtl.css b/assets/css/blocks-rtl.css
diff --git a/assets/css/blocks.css b/assets/css/blocks.css
diff --git a/assets/css/editor-style-blocks-rtl.css b/assets/css/editor-style-blocks-rtl.css
diff --git a/assets/css/editor-style-blocks.css b/assets/css/editor-style-blocks.css
diff --git a/assets/css/editor-style-classic-rtl.css b/assets/css/editor-style-classic-rtl.css
diff --git a/assets/css/editor-style-classic.css b/assets/css/editor-style-classic.css
diff --git a/assets/css/global-rtl.css b/assets/css/global-rtl.css
diff --git a/assets/css/global.css b/assets/css/global.css
diff --git a/assets/scss/blocks.scss b/assets/scss/blocks.scss
@@ -7,7 +7,7 @@
 // @copyright  WebMan Design, Oliver Juhas
 //
 // @since    1.0.0
-// @version  1.4.0
+// @version  1.4.1
 //
 
 $left: left;

diff --git a/assets/scss/blocks/_button.scss b/assets/scss/blocks/_button.scss
@@ -64,18 +64,12 @@
 
 	.wp-block-button.is-style-outline > .wp-block-button__link,
 	.wp-block-button__link.is-style-outline {
-		padding: ( $form_field_padding_vertical / $button_font_size * ( $ratio / 1.25 ) ) 1.5em;
-	}
-
-.is-style-outline > .wp-block-button__link,
-.wp-block-button__link.is-style-outline {
-	$button_padding_vertical : $form_field_padding_vertical / $button_font_size * ( $ratio / 1.25 );
-	$border_width : 1px;
+		$button_padding_vertical : $form_field_padding_vertical / $button_font_size * ( $ratio / 1.25 );
+		$border_width : 1px;
 
-	padding-top: calc( #{$button_padding_vertical} - #{$border_width} );
-	padding-bottom: calc( #{$button_padding_vertical} - #{$border_width} );
-	color: inherit;
-}
+		padding-top: calc( #{$button_padding_vertical} - #{$border_width} );
+		padding-bottom: calc( #{$button_padding_vertical} - #{$border_width} );
+	}
 
 .wp-block-buttons.is-style-large {
 	font-size: var(--typography_font_size_L_em);

diff --git a/assets/scss/global.scss b/assets/scss/global.scss
@@ -7,7 +7,7 @@
 // @copyright  WebMan Design, Oliver Juhas
 //
 // @since    1.0.0
-// @version  1.4.0
+// @version  1.4.1
 //
 
 $left: left;

diff --git a/assets/scss/global/form/_button.scss b/assets/scss/global/form/_button.scss
@@ -1,6 +1,7 @@
 /* FILE: global/form/_button.scss */
 
 #{ $selectors_button } {
+	display: inline-block; // This is must have not to overflow empty paragraph containers, for example.
 	padding: ( $form_field_padding_vertical / $button_font_size * ( $ratio / 1.25 ) ) 0;
 	font-family: var(--typography_font_global);
 	font-size: $button_font_size +em;

diff --git a/changelog.md b/changelog.md
@@ -1,14 +1,20 @@
 # Michelle Changelog
 
-## 1.5.0, 20221110
+## 1.4.1, 20221109
 
 ### Fixed
-- WordPress 6.1 compatibility
+- Outline button padding
+- Excerpt HTML in Query Loop block
+- Mobile pagination previous/next button not displaying
+- Full aligned blocks horizontal margin
 
 ### File updates
 	changelog.md
 	readme.txt
 	style.css
+	assets/scss/blocks.scss
+	assets/scss/global.scss
+	includes/Content/Block.php
 
 
 ## 1.4.0, 20221102

diff --git a/includes/Content/Block.php b/includes/Content/Block.php
@@ -6,7 +6,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    1.0.0
- * @version  1.3.8
+ * @version  1.4.1
  */
 
 namespace WebManDesign\Michelle\Content;
@@ -50,7 +50,7 @@ public static function init() {
 	 * Block editor output modifications.
 	 *
 	 * @since    1.0.0
-	 * @version  1.3.8
+	 * @version  1.4.1
 	 *
 	 * @param  string $block_content  The pre-rendered content. Default null.
 	 * @param  array  $block          The block being rendered.
@@ -174,6 +174,16 @@ public static function render_block( string $block_content, array $block ): stri
 				$block_content = preg_replace( $re, '<div class="entry-meta">$0</div>', $block_content );
 			}
 
+			// Post Excerpt block.
+			if ( 'core/post-excerpt' == $block['blockName'] ) {
+				// Remove excerpt opening paragraph tag.
+				$block_content = str_replace( '<p class="wp-block-post-excerpt__excerpt">', '', $block_content );
+				// Remove excerpt closing paragraph tag (is `</p></div>`).
+				$block_content = substr( $block_content, 0, -10 ) . '</div>';
+				// Adding excerpt class back in.
+				$block_content = str_replace( '"entry-summary', '"entry-summary wp-block-post-excerpt__excerpt', $block_content );
+			}
+
 			// Cover block.
 			if (
 				'core/cover' === $block['blockName']

diff --git a/includes/Content/Block_Area.php b/includes/Content/Block_Area.php
@@ -6,7 +6,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    1.0.6
- * @version  1.5.0
+ * @version  1.3.0
  */
 
 namespace WebManDesign\Michelle\Content;
@@ -21,8 +21,7 @@ class Block_Area implements Component_Interface {
 	/**
 	 * Initialization.
 	 *
-	 * @since    1.0.6
-	 * @version  1.5.0
+	 * @since  1.0.6
 	 *
 	 * @return  void
 	 */
@@ -32,71 +31,12 @@ public static function init() {
 
 			// Actions
 
-				add_action( 'after_setup_theme', __CLASS__ . '::after_setup_theme' );
-
 				add_action( 'michelle/content/404', __CLASS__ . '::error_404' );
 
 				add_action( 'tha_footer_top', __CLASS__ . '::footer' );
 
 	} // /init
 
-	/**
-	 * After setup theme.
-	 *
-	 * @since  1.5.0
-	 *
-	 * @return  void
-	 */
-	public static function after_setup_theme() {
-
-		// Processing
-
-			add_theme_support( 'block-template-parts' );
-
-	} // /after_setup_theme
-
-	/**
-	 * Gets WordPress 6.1+ block template part content.
-	 *
-	 * This is basically WordPress' `block_template_part()` function adapted
-	 * for our purpose - to return content instead of echoing it.
-	 *
-	 * @since  1.5.0
-	 *
-	 * @param  string $part  Name of block template part found in `parts` folder.
-	 *
-	 * @return  string
-	 */
-	public static function get_template_part_content( string $part = '' ): string {
-
-		// Requirements check
-
-			if (
-				empty( $part )
-				|| ! function_exists( 'block_template_part' )
-			) {
-				return '';
-			}
-
-
-		// Variables
-
-			$template_part = get_block_template( get_stylesheet() . '//' . $part, 'wp_template_part' );
-
-			if (
-				! $template_part
-				|| empty( $template_part->content )
-			) {
-				return '';
-			}
-
-
-		// Output
-
-			return trim( (string) do_blocks( $template_part->content ) );
-
-	} // /get_template_part_content
-
 	/**
 	 * Get block area post type key.
 	 *
@@ -123,40 +63,31 @@ public static function get_post_type(): string {
 	 * Site footer content.
 	 *
 	 * @since    1.0.0
-	 * @version  1.5.0
+	 * @version  1.3.0
 	 *
 	 * @return  void
 	 */
 	public static function footer() {
 
 		// Output
 
-			if ( ! empty( self::get_template_part_content( 'footer' ) ) ) {
-				remove_action( 'tha_footer_bottom', 'WebManDesign\Michelle\Footer\Component::site_info', 100 );
-				block_template_part( 'footer' );
-			} else {
-				get_template_part( 'templates/parts/block/area/footer' );
-			}
+			get_template_part( 'templates/parts/block/area/footer' );
 
 	} // /footer
 
 	/**
 	 * Error 404 page content.
 	 *
 	 * @since    1.0.6
-	 * @version  1.5.0
+	 * @version  1.3.0
 	 *
 	 * @return  void
 	 */
 	public static function error_404() {
 
 		// Output
 
-			if ( ! empty( self::get_template_part_content( 'error-404' ) ) ) {
-				block_template_part( 'error-404' );
-			} else {
-				get_template_part( 'templates/parts/block/area/404' );
-			}
+			get_template_part( 'templates/parts/block/area/404' );
 
 	} // /error_404
 

diff --git a/parts/error-404.html b/parts/error-404.html
diff --git a/parts/footer.html b/parts/footer.html
diff --git a/readme.txt b/readme.txt
@@ -35,8 +35,8 @@ Please see `changelog.md` file.
 
 == Upgrade Notice ==
 
-= 1.5.0 =
-Fixing WordPress 6.1 compatibility.
+= 1.4.1 =
+Fixing bugs.
 
 
 == Copyright ==

diff --git a/style.css b/style.css
@@ -3,7 +3,7 @@ Theme Name:    Michelle
 Theme URI:     https://www.webmandesign.eu/portfolio/michelle-wordpress-theme/
 Author:        WebMan Design
 Author URI:    https://www.webmandesign.eu/
-Version:       1.5.0
+Version:       1.4.1
 Text Domain:   michelle
 Domain Path:   /languages
 License:       GPL-3.0-or-later