Browse Source

Merge pull request #2841 from Automattic/fix/issue-2781

Seedlet: Remove side padding from Group block
Jeff Ong 4 years ago
parent
commit
87a0324040

+ 10 - 8
altofocus/index.php

@@ -31,18 +31,20 @@ get_header(); ?>
 			$feautured_id_array = altofocus_get_featured_post_ids();
 			$feautured_id_array = altofocus_get_featured_post_ids();
 
 
 			/* Start the Loop */
 			/* Start the Loop */
-			while ( have_posts() ) : the_post();
+		while ( have_posts() ) :
+			the_post();
 
 
-				/*
-				 * Include the Post-Format-specific template for the content.
-				 * If you want to override this in a child theme, then include a file
-				 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
-				 */
-				get_template_part( 'components/post/content', get_post_format() );
+			/*
+			 * Include the Post-Format-specific template for the content.
+			 * If you want to override this in a child theme, then include a file
+			 * called content-___.php (where ___ is the Post Format name) and that will be used instead.
+			 */
+			get_template_part( 'components/post/content', get_post_format() );
 
 
 			endwhile;
 			endwhile;
 
 
-			the_posts_navigation(); ?>
+			the_posts_navigation();
+		?>
 
 
 		</main>
 		</main>
 
 

+ 2 - 1
altofocus/page.php

@@ -18,7 +18,8 @@ get_header(); ?>
 		<main id="main" class="site-main" role="main">
 		<main id="main" class="site-main" role="main">
 
 
 			<?php
 			<?php
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 
 				get_template_part( 'components/page/content', 'page' );
 				get_template_part( 'components/page/content', 'page' );
 
 

+ 0 - 2
seedlet/assets/sass/blocks/group/_style.scss

@@ -3,8 +3,6 @@
 	.wp-block-group__inner-container {
 	.wp-block-group__inner-container {
 		margin-left: auto;
 		margin-left: auto;
 		margin-right: auto;
 		margin-right: auto;
-		padding-left: var(--global--spacing-horizontal);
-		padding-right: var(--global--spacing-horizontal);
 
 
 		> * {
 		> * {
 			margin-top: calc( 0.666 * var(--global--spacing-vertical) );
 			margin-top: calc( 0.666 * var(--global--spacing-vertical) );

+ 1 - 1
seedlet/assets/sass/style.scss

@@ -7,7 +7,7 @@ Description: Seedlet is a free WordPress theme. A two-column layout and classica
 Requires at least: 5.4
 Requires at least: 5.4
 Tested up to: 5.5
 Tested up to: 5.5
 Requires PHP: 5.6.2
 Requires PHP: 5.6.2
-Version: 1.1.3-wpcom
+Version: 1.1.4-wpcom
 License: GNU General Public License v2 or later
 License: GNU General Public License v2 or later
 License URI: LICENSE
 License URI: LICENSE
 Text Domain: seedlet
 Text Domain: seedlet

+ 13 - 11
seedlet/inc/template-functions.php

@@ -78,39 +78,41 @@ add_filter( 'comment_form_defaults', 'seedlet_comment_form_defaults' );
 function seedlet_get_the_archive_title( $title, $original_title, $prefix ) {
 function seedlet_get_the_archive_title( $title, $original_title, $prefix ) {
 	if ( is_category() ) {
 	if ( is_category() ) {
 		$prefix = '<span class="archive-prefix">' . __( 'Category Archives: ', 'seedlet' ) . '</span>';
 		$prefix = '<span class="archive-prefix">' . __( 'Category Archives: ', 'seedlet' ) . '</span>';
-		$title 	= '<span class="page-description">' . single_term_title( '', false ) . '</span>';
+		$title  = '<span class="page-description">' . single_term_title( '', false ) . '</span>';
 	} elseif ( is_tag() ) {
 	} elseif ( is_tag() ) {
 		$prefix = '<span class="archive-prefix">' . __( 'Tag Archives: ', 'seedlet' ) . ' </span>';
 		$prefix = '<span class="archive-prefix">' . __( 'Tag Archives: ', 'seedlet' ) . ' </span>';
-		$title 	= '<span class="page-description">' . single_term_title( '', false ) . '</span>';
+		$title  = '<span class="page-description">' . single_term_title( '', false ) . '</span>';
 	} elseif ( is_author() ) {
 	} elseif ( is_author() ) {
 		$prefix = '<span class="archive-prefix">' . __( 'Author Archives: ', 'seedlet' ) . ' </span>';
 		$prefix = '<span class="archive-prefix">' . __( 'Author Archives: ', 'seedlet' ) . ' </span>';
-		$title 	= '<span class="page-description">' . get_the_author_meta( 'display_name' ) . '</span>';
+		$title  = '<span class="page-description">' . get_the_author_meta( 'display_name' ) . '</span>';
 	} elseif ( is_year() ) {
 	} elseif ( is_year() ) {
 		$prefix = '<span class="archive-prefix">' . __( 'Yearly Archives: ', 'seedlet' ) . ' </span>';
 		$prefix = '<span class="archive-prefix">' . __( 'Yearly Archives: ', 'seedlet' ) . ' </span>';
-		$title 	= '<span class="page-description">' . get_the_date( _x( 'Y', 'yearly archives date format', 'seedlet' ) ) . '</span>';
+		$title  = '<span class="page-description">' . get_the_date( _x( 'Y', 'yearly archives date format', 'seedlet' ) ) . '</span>';
 	} elseif ( is_month() ) {
 	} elseif ( is_month() ) {
 		$prefix = '<span class="archive-prefix">' . __( 'Monthly Archives: ', 'seedlet' ) . ' </span>';
 		$prefix = '<span class="archive-prefix">' . __( 'Monthly Archives: ', 'seedlet' ) . ' </span>';
-		$title 	= '<span class="page-description">' . get_the_date( _x( 'F Y', 'monthly archives date format', 'seedlet' ) ) . '</span>';
+		$title  = '<span class="page-description">' . get_the_date( _x( 'F Y', 'monthly archives date format', 'seedlet' ) ) . '</span>';
 	} elseif ( is_day() ) {
 	} elseif ( is_day() ) {
 		$prefix = '<span class="archive-prefix">' . __( 'Daily Archives: ', 'seedlet' ) . ' </span>';
 		$prefix = '<span class="archive-prefix">' . __( 'Daily Archives: ', 'seedlet' ) . ' </span>';
-		$title 	= '<span class="page-description">' . get_the_date() . '</span>';
+		$title  = '<span class="page-description">' . get_the_date() . '</span>';
 	} elseif ( is_post_type_archive() ) {
 	} elseif ( is_post_type_archive() ) {
 		$prefix = '';
 		$prefix = '';
-		$cpt = get_post_type_object( get_queried_object()->name );
+		$cpt    = get_post_type_object( get_queried_object()->name );
 		/* translators: %s: Post type singular name */
 		/* translators: %s: Post type singular name */
-		$title = sprintf( esc_html__( '%s Archives', 'seedlet' ),
+		$title = sprintf(
+			esc_html__( '%s Archives', 'seedlet' ),
 			$cpt->labels->singular_name
 			$cpt->labels->singular_name
 		);
 		);
 	} elseif ( is_tax() ) {
 	} elseif ( is_tax() ) {
 		$prefix = '';
 		$prefix = '';
-		$tax = get_taxonomy( get_queried_object()->taxonomy );
+		$tax    = get_taxonomy( get_queried_object()->taxonomy );
 		/* translators: %s: Taxonomy singular name */
 		/* translators: %s: Taxonomy singular name */
-		$title = sprintf( esc_html__( '%s Archives', 'seedlet' ),
+		$title = sprintf(
+			esc_html__( '%s Archives', 'seedlet' ),
 			$tax->labels->singular_name
 			$tax->labels->singular_name
 		);
 		);
 	} else {
 	} else {
 		$prefix = '';
 		$prefix = '';
-		$title 	= '<span class="archive-prefix">' . __( 'Archives: ', 'seedlet' ) . ' </span>';
+		$title  = '<span class="archive-prefix">' . __( 'Archives: ', 'seedlet' ) . ' </span>';
 	}
 	}
 
 
 	return '<h1 class="page-title">' . $prefix . $title . '</h1>';
 	return '<h1 class="page-title">' . $prefix . $title . '</h1>';

+ 1 - 1
seedlet/package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "seedlet",
   "name": "seedlet",
-  "version": "1.1.3",
+  "version": "1.1.4-wpcom",
   "description": "Seedlet",
   "description": "Seedlet",
   "bugs": {
   "bugs": {
     "url": "https://github.com/Automattic/seedlet/issues"
     "url": "https://github.com/Automattic/seedlet/issues"

+ 1 - 3
seedlet/style-rtl.css

@@ -7,7 +7,7 @@ Description: Seedlet is a free WordPress theme. A two-column layout and classica
 Requires at least: 5.4
 Requires at least: 5.4
 Tested up to: 5.5
 Tested up to: 5.5
 Requires PHP: 5.6.2
 Requires PHP: 5.6.2
-Version: 1.1.3-wpcom
+Version: 1.1.4-wpcom
 License: GNU General Public License v2 or later
 License: GNU General Public License v2 or later
 License URI: LICENSE
 License URI: LICENSE
 Text Domain: seedlet
 Text Domain: seedlet
@@ -1540,8 +1540,6 @@ object {
 .wp-block-group .wp-block-group__inner-container {
 .wp-block-group .wp-block-group__inner-container {
 	margin-right: auto;
 	margin-right: auto;
 	margin-left: auto;
 	margin-left: auto;
-	padding-right: var(--global--spacing-horizontal);
-	padding-left: var(--global--spacing-horizontal);
 }
 }
 
 
 .wp-block-group .wp-block-group__inner-container > * {
 .wp-block-group .wp-block-group__inner-container > * {

+ 1 - 3
seedlet/style.css

@@ -7,7 +7,7 @@ Description: Seedlet is a free WordPress theme. A two-column layout and classica
 Requires at least: 5.4
 Requires at least: 5.4
 Tested up to: 5.5
 Tested up to: 5.5
 Requires PHP: 5.6.2
 Requires PHP: 5.6.2
-Version: 1.1.3-wpcom
+Version: 1.1.4-wpcom
 License: GNU General Public License v2 or later
 License: GNU General Public License v2 or later
 License URI: LICENSE
 License URI: LICENSE
 Text Domain: seedlet
 Text Domain: seedlet
@@ -1540,8 +1540,6 @@ object {
 .wp-block-group .wp-block-group__inner-container {
 .wp-block-group .wp-block-group__inner-container {
 	margin-left: auto;
 	margin-left: auto;
 	margin-right: auto;
 	margin-right: auto;
-	padding-left: var(--global--spacing-horizontal);
-	padding-right: var(--global--spacing-horizontal);
 }
 }
 
 
 .wp-block-group .wp-block-group__inner-container > * {
 .wp-block-group .wp-block-group__inner-container > * {