Merge pull request #56 from OpenSourceOrg/merge/blog-import-to-main

Merge/blog import to main

Author: NickGreen

package-lock.json

@@ -35,7 +35,7 @@ p, h1, h2, h3, h4, h5, h6, blockquote, ol, ul, dl, address {
 
 	.single-post .cover--header {
 		&.no-thumbnail {
-			min-height: 430px;
+			min-height: 305px;
 		}
 	}
 
@@ -211,3 +211,94 @@ p, h1, h2, h3, h4, h5, h6, blockquote, ol, ul, dl, address {
 .post--content {
 	margin-bottom: 20px;
 }
+.blog {
+	.content .content-full .content--page {
+		max-width: 1250px;
+	}
+	.post-archive-wrap {
+		width:100%;
+
+		p:last-of-type {
+			margin-bottom: 0;
+		}
+		.wp-block-column h2 {
+			margin-top: 20px;
+		}
+	}
+	.sidebar.content--sidebar {
+		width:100%;
+		font-size: 14px;
+	}
+	article.first-post {
+		.osi-list--image img {
+			width: 100%;
+			margin-top: 40px;
+		}
+		.osi-list--post-content {
+			width: 100%;
+			background-color: #f7f7f7;
+			padding: 32px;
+
+			p:last-of-type {
+				margin-bottom: 0;
+			}
+		}
+	}
+	.entry-meta.post--byline a {
+		color: #767676;
+		font-size: clamp(14px, 0.875rem + ((1vw - 3.2px) * 0.217), 16px);
+	}
+	.sidebar .has-avatars .wp-block-latest-comments__comment .wp-block-latest-comments__comment-meta {
+		margin: 0;
+	}
+	.sidebar ol.wp-block-latest-comments {
+		padding: 0;
+	}
+	.sidebar .wp-block-latest-posts__post-title {
+		font-size: 16px;
+	}
+	.special-sep {
+		margin: 100px 0;
+	}
+	.special-sep:after {
+		content: '';
+		left: calc(50% - 80px / 2);
+		width: 80px;
+		content: '';
+		position: absolute;
+		height: 40px;
+		top: -20px;
+		background: #FFFFFF url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAyNi4wLjEsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4yIiBiYXNlUHJvZmlsZT0idGlueSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiDQoJIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMjU2IDI0OCIgb3ZlcmZsb3c9InZpc2libGUiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPGc+DQoJPHBhdGggZmlsbD0ibm9uZSIgZD0iTTE0My4zLDE2Ny44YzIyLjEtOC41LDMzLjEtMzMuMiwyNC42LTU1LjNjLTguNS0yMi4xLTMzLjItMzMuMS01NS4zLTI0LjZjLTIyLjEsOC41LTMzLjEsMzMuMi0yNC42LDU1LjMNCgkJYzQuMywxMS4zLDEzLjMsMjAuMywyNC42LDI0LjZMODMuOCwyNDNjLTYzLjUtMjQuNC05NS4zLTk1LjctNzAuOS0xNTkuM3M5NS43LTk1LjMsMTU5LjItNzAuOXM5NS4zLDk1LjcsNzAuOSwxNTkuMw0KCQljLTEyLjUsMzIuNi0zOC4zLDU4LjQtNzAuOSw3MC45TDE0My4zLDE2Ny44Ii8+DQoJPHBhdGggZmlsbD0iIzIzMUYyMCIgZD0iTTE3Mi4yLDI0Ny40Yy0wLjYsMC0xLjItMC4xLTEuOC0wLjRjLTEuMS0wLjUtMS45LTEuNC0yLjMtMi40bC0yOC44LTc1LjFjLTAuOS0yLjMsMC4zLTQuOCwyLjUtNS43DQoJCWM5LjYtMy43LDE3LjEtMTAuOSwyMS4zLTIwLjJjNC4yLTkuNCw0LjQtMTkuOCwwLjgtMjkuNEMxNTYuMiw5NC4zLDEzNCw4NC40LDExNC4yLDkyYy0xOS44LDcuNi0yOS43LDI5LjgtMjIuMSw0OS42DQoJCWMzLjksMTAuMSwxMS45LDE4LjIsMjIuMSwyMi4xYzIuMywwLjksMy40LDMuNCwyLjUsNS43TDg4LDI0NC41Yy0wLjQsMS4xLTEuMywyLTIuMywyLjRjLTEuMSwwLjUtMi4zLDAuNS0zLjQsMC4xDQoJCWMtMzEuOC0xMi4yLTU3LTM2LjEtNzAuOS02Ny4zQy0yLjUsMTQ4LjctMy40LDExNCw4LjgsODIuMXMzNi4xLTU3LDY3LjItNzAuOXM2NS44LTE0LjgsOTcuNy0yLjZzNTcsMzYuMSw3MC45LDY3LjMNCgkJYzEzLjksMzEuMiwxNC44LDY1LjgsMi42LDk3LjdjLTEyLjksMzMuNy0zOS43LDYwLjUtNzMuNCw3My41QzE3My4yLDI0Ny4zLDE3Mi43LDI0Ny40LDE3Mi4yLDI0Ny40TDE3Mi4yLDI0Ny40eiBNMTI4LDguOQ0KCQljLTE2LjQsMC0zMi44LDMuNS00OC4zLDEwLjNjLTI5LDEyLjktNTEuMiwzNi40LTYyLjYsNjZjLTExLjQsMjkuNi0xMC41LDYxLjksMi40LDkwLjljMTIuMywyNy43LDM0LjIsNDkuMiw2MS45LDYxbDI1LjctNjcNCgkJYy0xMC42LTUuMi0xOC45LTE0LjMtMjMuMS0yNS40Yy05LjMtMjQuMywyLjktNTEuNywyNy4xLTYxYzI0LjMtOS4zLDUxLjYsMi45LDYxLDI3LjJjNC41LDExLjgsNC4yLDI0LjYtMC45LDM2LjENCgkJYy00LjUsMTAuMi0xMi4zLDE4LjItMjIuMiwyMy4xbDI1LjcsNjdjMjkuNS0xMi42LDUyLjgtMzYuNyw2NC4zLTY2LjdjMTEuNC0yOS42LDEwLjUtNjEuOS0yLjQtOTAuOWMtMTIuOS0yOS0zNi4zLTUxLjItNjYtNjIuNg0KCQlDMTU2LjgsMTEuNiwxNDIuMyw4LjksMTI4LDguOUwxMjgsOC45eiIvPg0KCTxwYXRoIGZpbGw9IiMyMzFGMjAiIGQ9Ik0yMzcuNywyMjkuNmMtMS42LDEuNi0yLjQsMy42LTIuNCw1LjhjMCwyLjMsMC44LDQuMywyLjQsNS45YzEuNiwxLjYsMy42LDIuNCw1LjksMi40DQoJCWMyLjMsMCw0LjItMC44LDUuOC0yLjRjMS42LTEuNiwyLjQtMy42LDIuNC01LjljMC0yLjItMC44LTQuMi0yLjQtNS44Yy0xLjYtMS43LTMuNi0yLjUtNS45LTIuNQ0KCQlDMjQxLjMsMjI3LjEsMjM5LjQsMjI3LjksMjM3LjcsMjI5LjZMMjM3LjcsMjI5LjZ6IE0yNTAuNywyNDIuNmMtMiwxLjktNC4zLDIuOC03LDIuOGMtMi44LDAtNS4yLTEtNy4xLTIuOQ0KCQljLTEuOS0xLjktMi45LTQuMy0yLjktNy4xYzAtMi45LDEtNS40LDMuMS03LjNjMi0xLjgsNC4zLTIuNyw2LjktMi43YzIuOCwwLDUuMSwxLDcuMSwyLjljMiwyLDIuOSw0LjMsMi45LDcuMQ0KCQlDMjUzLjcsMjM4LjIsMjUyLjcsMjQwLjYsMjUwLjcsMjQyLjZMMjUwLjcsMjQyLjZ6IE0yNDQuNSwyMzJjLTAuNC0wLjItMS0wLjItMS43LTAuMmgtMC43djMuMmgxLjFjMC43LDAsMS4yLTAuMSwxLjYtMC40DQoJCXMwLjYtMC43LDAuNi0xLjNDMjQ1LjQsMjMyLjcsMjQ1LjEsMjMyLjMsMjQ0LjUsMjMyTDI0NC41LDIzMnogTTIzOS4yLDI0MXYtMTEuMWMwLjcsMCwxLjcsMCwzLjEsMHMyLjEsMCwyLjMsMA0KCQljMC45LDAuMSwxLjYsMC4zLDIuMiwwLjZjMSwwLjUsMS41LDEuNCwxLjUsMi43YzAsMC45LTAuMywxLjYtMC44LDJjLTAuNSwwLjQtMS4yLDAuNy0xLjksMC43YzAuNywwLjEsMS4yLDAuNCwxLjYsMC42DQoJCWMwLjcsMC41LDEsMS40LDEsMi41djFjMCwwLjEsMCwwLjIsMCwwLjNzMCwwLjIsMC4xLDAuM2wwLjEsMC4zaC0yLjhjLTAuMS0wLjQtMC4xLTAuOS0wLjItMS41cy0wLjEtMS4xLTAuMi0xLjQNCgkJYy0wLjEtMC40LTAuNC0wLjctMC44LTAuOGMtMC4yLTAuMS0wLjUtMC4xLTEtMC4ybC0wLjYsMGgtMC42djMuOUgyMzkuMnoiLz4NCjwvZz4NCjwvc3ZnPg0K) no-repeat center;
+	}
+}
+
+@media (min-width: 1000px) {
+	.blog {
+		article.first-post {
+			display: flex;
+			flex-wrap: nowrap !important;
+			
+			.osi-list--image {
+				flex-basis: 60%;
+				flex-grow: 0;
+			}
+			.osi-list--post-content {
+				flex-basis: 52%;
+				flex-grow: 0;
+				align-self: center;
+				position: relative;
+				z-index: 9;
+				margin-left: -64px;
+			}
+		}
+		.sidebar.content--sidebar {
+			display:inline-block;
+			width:18%;
+			padding-left: 20px;
+		}
+		.post-archive-wrap {
+			display:inline-block;
+			width:80%;
+		}
+	}
+  }

themes/osi/assets/scss/_6_components.content.scss

@@ -22,56 +22,6 @@
 
 <div id="comments" class="comments comments-area">
 
-	<?php
-	// You can start editing here -- including this comment!
-	if ( have_comments() ) :
-		?>
-		<h3 class="comments--title">
-			<?php
-			$comment_count = get_comments_number();
-			if ( 1 === $comment_count ) {
-				printf(
-					/* translators: 1: title. */
-					esc_html_e( 'One thought on &ldquo;%1$s&rdquo;', 'osi' ),
-					'<span>' . esc_html( get_the_title() ) . '</span>'
-				);
-			} else {
-				printf( // phpcs:ignore
-					/* translators: 1: comment count number, 2: title. */
-					esc_html( _nx( '%1$s thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', $comment_count, 'comments title', 'osi' ) ),
-					esc_html( number_format_i18n( $comment_count ) ),
-					'<span>' . esc_html( get_the_title() ) . '</span>'
-				);
-			}
-			?>
-		</h2><!-- .comments-title -->
-
-		<?php the_comments_navigation(); ?>
-
-		<ol class="comments--list">
-			<?php
-				wp_list_comments(
-					array(
-						'style'      => 'ol',
-						'short_ping' => true,
-					)
-				);
-			?>
-		</ol><!-- .comment-list -->
-
-		<?php
-		the_comments_navigation();
-
-		// If comments are closed and there are comments, let's leave a little note, shall we?
-		if ( ! comments_open() ) :
-			?>
-			<p class="no-comments alert alert-warning"><?php esc_html_e( 'Comments are closed.', 'osi' ); ?></p>
-			<?php
-		endif;
-
-	endif; // Check for have_comments().
-
-	comment_form();
-	?>
+	<?php comment_form(); ?>
 
 </div><!-- #comments -->

themes/osi/comments.php

@@ -2,13 +2,15 @@
 /**
  * The template for displaying the footer
  *
- *
  * @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
  *
  * @package osi
  */
 
 $footerclass = is_active_sidebar( 'sidebar-footer' ) ? 'widgetized-footer footer--widgets' : 'standard-footer';
+if ( is_blog() ) :
+	get_template_part( 'template-parts/email-block' );
+endif;
 ?>
 
 		<footer id="colophon" class="footer site-footer" role="contentinfo">
@@ -52,4 +54,4 @@
 <?php wp_footer(); ?>
 
 </body>
-</html>
+</html>

themes/osi/footer.php

@@ -14,6 +14,8 @@
 	 * Note that this function is hooked into the after_setup_theme hook, which
 	 * runs before the init hook. The init hook is too late for some features, such
 	 * as indicating support for post thumbnails.
+	 *
+	 * @return void
 	 */
 	function osi_setup() {
 		/*
@@ -114,6 +116,8 @@ function osi_setup() {
 
 /**
  * Register sidebars and widgets
+ *
+ * @return void
  */
 function osi_widgets_init() {
 	// Sidebars
@@ -168,7 +172,8 @@ function osi_widgets_init() {
  *
  * Priority 0 to make it available to lower priority callbacks.
  *
- * @global int $content_width
+ * @global int $content_width Content width to set.
+ * @return void
  */
 function osi_content_width() {
 	$GLOBALS['content_width'] = apply_filters( 'osi_content_width', 640 );
@@ -177,6 +182,8 @@ function osi_content_width() {
 
 /**
  * Add a reusable block admin menu link for easy administration.
+ *
+ * @return void
  */
 function osi_reusable_blocks_admin_menu(): void {
 	add_theme_page(
@@ -192,6 +199,8 @@ function osi_reusable_blocks_admin_menu(): void {
 
 /**
  * Enqueue scripts and styles.
+ *
+ * @return void
  */
 function osi_scripts() {
 	wp_enqueue_style(
@@ -226,7 +235,11 @@ function osi_scripts() {
 }
 add_action( 'wp_enqueue_scripts', 'osi_scripts' );
 
-/** Frontend Inline Styles **/
+/**
+ * Add inline styles to the frontend.
+ *
+ * @return void
+ */
 function osi_inline_styles() {
 	wp_add_inline_style( 'osi-style', osi_palette_css() );
 	wp_add_inline_style( 'osi-style', osi_gradient_css() );
@@ -235,7 +248,11 @@ function osi_inline_styles() {
 }
 add_action( 'wp_enqueue_scripts', 'osi_inline_styles', 100 ); // prioritize as last
 
-/** Block Editor Styles **/
+/**
+ * Add block editor assets.
+ *
+ * @return void
+ */
 function osi_add_block_editor_assets() {
 	wp_enqueue_style( 'editor-styles', get_template_directory_uri() . '/assets/css/editor-style.css', '', 1 );
 	wp_add_inline_style( 'editor-styles', osi_palette_css() );
@@ -316,9 +333,11 @@ function osi_add_block_editor_assets() {
 
 /**
  * Register the "Footer - Above credits" sidebar.
+ *
+ * @return void
  */
 function register_footer_above_sidebar() {
-    register_sidebar(
+	register_sidebar(
 		array(
 			'name'          => esc_html__( 'Footer - Above Credits', 'osi' ),
 			'id'            => 'footer-above-credits',
@@ -327,7 +346,51 @@ function register_footer_above_sidebar() {
 			'after_widget'  => '</div>',
 			'before_title'  => '<h2 class="widget-title">',
 			'after_title'   => '</h2>',
-    	)
+		)
 	);
 }
-add_action('widgets_init', 'register_footer_above_sidebar');
+add_action( 'widgets_init', 'register_footer_above_sidebar' );
+
+/**
+ * Adjust the 'blog' (post archive) to show a different number of posts on the first page.
+ *
+ * @param WP_Query $query WordPress Query object.
+ *
+ * @return void
+ */
+function osi_query_offset( WP_Query &$query ) {
+	if ( ! ( $query->is_blog() || is_main_query() ) || is_admin() || is_front_page() || is_archive() || is_404() ) {
+		return;
+	}
+
+	$offset = -1;
+	$ppp    = get_option( 'posts_per_page' );
+
+	if ( $query->is_paged ) {
+		// Manually determine page query offset (offset + current page (minus one) x posts per page)
+		$page_offset = $offset + ( ( $query->query_vars['paged'] - 1 ) * $ppp );
+		// Apply adjust page offset
+		$query->set( 'offset', $page_offset );
+	} else {
+		// This is the first page. Set a different number for posts per page
+		$query->set( 'posts_per_page', $offset + $ppp );
+	}
+}
+add_action( 'pre_get_posts', 'osi_query_offset', 1 );
+
+/**
+ * Adjust the pagination offset.
+ *
+ * @param integer  $found_posts The number of found posts.
+ * @param WP_Query $query       WordPress Query object.
+ *
+ * @return integer Adjusted number of found posts.
+ */
+function osi_adjust_offset_pagination( int $found_posts, WP_Query $query ) {
+	$offset = -1;
+	if ( $query->is_blog() && is_main_query() && ! is_admin() && ! $query->is_front_page() ) {
+		return $found_posts - $offset;
+	}
+	return $found_posts;
+}
+add_filter( 'found_posts', 'osi_adjust_offset_pagination', 1, 2 );

themes/osi/functions.php

@@ -78,12 +78,7 @@ function osi_excerpt_length( $length ) {
 }
 
 function osi_excerpt_more( $more ) {
-
-	if ( is_post_type_archive( sugar_calendar_get_event_post_type_id() ) ) {
 		return '...';
-	}
-
-	return '... <a class="read-more" href="' . get_permalink( get_the_ID() ) . '">' . __( 'Read More', 'osi' ) . '</a>';
 }
 add_filter( 'excerpt_length', 'osi_excerpt_length' );
 add_filter( 'excerpt_more', 'osi_excerpt_more' );