From 2ac8d760e65f444f833bec9bc99cac786630ce7b Mon Sep 17 00:00:00 2001
From: JC <jc@webdevstudios.com>
Date: Tue, 5 Sep 2023 03:08:34 +0800
Subject: [PATCH] WDSUS-4 - Remove extra functions and fix content issue

---
 comments.php                                  |  2 +-
 inc/setup/content-width.php                   | 23 ----------
 inc/setup/setup.php                           | 43 -------------------
 inc/template-tags/print-entry-footer.php      |  4 +-
 template-parts/content-page.php               |  8 ++--
 template-parts/content-password-protected.php |  2 +-
 template-parts/content-search.php             |  6 +--
 template-parts/content.php                    |  4 +-
 8 files changed, 13 insertions(+), 79 deletions(-)
 delete mode 100644 inc/setup/content-width.php

diff --git a/comments.php b/comments.php
index 3550c166b..9ccc951df 100644
--- a/comments.php
+++ b/comments.php
@@ -21,7 +21,7 @@
 }
 ?>
 
-<div id="comments" class="comments-area">
+<div id="comments" class="comments-area is-layout-constrained">
 	<h2 class="screen-reader-text"><?php esc_html_e( 'Comment section', 'wd_s' ); ?></h2>
 
 	<?php
diff --git a/inc/setup/content-width.php b/inc/setup/content-width.php
deleted file mode 100644
index 7ade64e0f..000000000
--- a/inc/setup/content-width.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Set the content width in pixels, based on the theme's design and stylesheet.
- *
- * @package wd_s
- */
-
-namespace WebDevStudios\wd_s;
-
-/**
- * Set the content width in pixels, based on the theme's design and stylesheet.
- *
- * Priority 0 to make it available to lower priority callbacks.
- *
- * @global int $content_width
- *
- * @author WebDevStudios
- */
-function content_width() {
-	$GLOBALS['content_width'] = apply_filters( 'wd_s_content_width', 640 );
-}
-
-add_action( 'after_setup_theme', __NAMESPACE__ . '\content_width', 0 );
diff --git a/inc/setup/setup.php b/inc/setup/setup.php
index aa065441d..631dd3966 100644
--- a/inc/setup/setup.php
+++ b/inc/setup/setup.php
@@ -49,8 +49,6 @@ function setup() {
 	register_nav_menus(
 		[
 			'primary' => esc_html__( 'Primary Menu', 'wd_s' ),
-			'footer'  => esc_html__( 'Footer Menu', 'wd_s' ),
-			'mobile'  => esc_html__( 'Mobile Menu', 'wd_s' ),
 		]
 	);
 
@@ -69,18 +67,6 @@ function setup() {
 		]
 	);
 
-	// Set up the WordPress core custom background feature.
-	add_theme_support(
-		'custom-background',
-		apply_filters(
-			'wd_s_custom_background_args',
-			[
-				'default-color' => 'ffffff',
-				'default-image' => '',
-			]
-		)
-	);
-
 	// Custom logo support.
 	add_theme_support(
 		'custom-logo',
@@ -99,39 +85,10 @@ function setup() {
 	// Gutenberg support for full-width/wide alignment of supported blocks.
 	add_theme_support( 'align-wide' );
 
-	// Gutenberg defaults for font sizes.
-	add_theme_support(
-		'editor-font-sizes',
-		[
-			[
-				'name' => __( 'Small', 'wd_s' ),
-				'size' => 12,
-				'slug' => 'small',
-			],
-			[
-				'name' => __( 'Normal', 'wd_s' ),
-				'size' => 16,
-				'slug' => 'normal',
-			],
-			[
-				'name' => __( 'Large', 'wd_s' ),
-				'size' => 36,
-				'slug' => 'large',
-			],
-			[
-				'name' => __( 'Huge', 'wd_s' ),
-				'size' => 50,
-				'slug' => 'huge',
-			],
-		]
-	);
-
 	// Gutenberg editor styles support.
 	add_theme_support( 'editor-styles' );
 	add_editor_style( 'build/index.css' );
 
-	// Gutenberg responsive embed support.
-	add_theme_support( 'responsive-embeds' );
 }
 
 add_action( 'after_setup_theme', __NAMESPACE__ . '\setup' );
diff --git a/inc/template-tags/print-entry-footer.php b/inc/template-tags/print-entry-footer.php
index ae92a017c..f24200066 100644
--- a/inc/template-tags/print-entry-footer.php
+++ b/inc/template-tags/print-entry-footer.php
@@ -44,7 +44,7 @@ function print_entry_footer() {
 			esc_html__( 'Edit %s', 'wd_s' ),
 			wp_kses_post( get_the_title( '<span class="screen-reader-text">"', '"</span>', false ) )
 		),
-		'<span class="edit-link">',
-		'</span>'
+		'<div class="edit-link">',
+		'</div>'
 	);
 }
diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index cb08ca751..171b711ee 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -9,7 +9,7 @@
 
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class( 'is-layout-constrained' ); ?>>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
 	<header class="entry-header is-layout-constrained">
 		<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
@@ -29,7 +29,7 @@
 	</div><!-- .entry-content -->
 
 	<?php if ( get_edit_post_link() ) : ?>
-		<footer class="entry-footer">
+		<footer class="entry-footer is-layout-constrained">
 			<?php
 				edit_post_link(
 					sprintf(
@@ -37,8 +37,8 @@
 						esc_html__( 'Edit %s', 'wd_s' ),
 						the_title( '<span class="screen-reader-text">"', '"</span>', false )
 					),
-					'<span class="edit-link">',
-					'</span>'
+					'<div class="edit-link">',
+					'</div>'
 				);
 			?>
 		</footer><!-- .entry-footer -->
diff --git a/template-parts/content-password-protected.php b/template-parts/content-password-protected.php
index abcdf47e5..88fa8481f 100644
--- a/template-parts/content-password-protected.php
+++ b/template-parts/content-password-protected.php
@@ -9,7 +9,7 @@
 
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class( 'is-layout-constrained' ); ?>>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
 	<header class="entry-header is-layout-constrained">
 		<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index 6d22edd68..c9b1a8627 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -13,7 +13,7 @@
 
 ?>
 
-<article <?php post_class( 'is-layout-constrained' ); ?>>
+<article <?php post_class(); ?>>
 
 	<header class="entry-header is-layout-constrained">
 		<?php the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' ); ?>
@@ -26,11 +26,11 @@
 		<?php endif; ?>
 	</header><!-- .entry-header -->
 
-	<div class="entry-summary">
+	<div class="entry-summary is-layout-constrained">
 		<?php the_excerpt(); ?>
 	</div><!-- .entry-summary -->
 
-	<footer class="entry-footer">
+	<footer class="entry-footer is-layout-constrained">
 		<?php print_entry_footer(); ?>
 	</footer><!-- .entry-footer -->
 
diff --git a/template-parts/content.php b/template-parts/content.php
index 0deeff52e..3a9f0ac68 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -13,7 +13,7 @@
 
 ?>
 
-<article <?php post_class( 'post-container is-layout-constrained' ); ?>>
+<article <?php post_class( 'post-container' ); ?>>
 
 	<header class="entry-header is-layout-constrained">
 		<?php
@@ -58,7 +58,7 @@
 		?>
 	</div><!-- .entry-content -->
 
-	<footer class="entry-footer">
+	<footer class="entry-footer is-layout-constrained">
 		<?php print_entry_footer(); ?>
 	</footer><!-- .entry-footer -->