Merge pull request #33 from wpkitpro/develop

Develop

README.md

@@ -2,7 +2,7 @@
 
 A lightweight and minimalist WordPress theme for Elementor site builder.
 
-<p><a href="https://wpkit.pro/themes/wpkit-elementor"><img src="https://wpkit.pro/wp-content/uploads/wporg-theme-images/screenshot.png?w=600&strip=all" alt="WP Kit Elementor"></a></p>
+<p><a href="https://wpkit.pro/themes/wpkit-elementor"><img src="https://wpkit.pro/wp-content/uploads/wporg-theme-images/screenshot.png" alt="WP Kit Elementor"></a></p>
 
 ## Description
 

assets/sass/abstracts/_variables.scss

@@ -1,10 +1,12 @@
 // Colors
+$gray-base: #212529 !default;
 $blue: #605be5 !default;
 $dark-blue: #333366 !default;
+$light-gray: #e8e8e8 !default;
 
 
 // Text and Paragraph
-$text-color: #212529;
+$text-color: $gray-base;
 
 // Fonts
 $font-family-base: -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";

assets/sass/style-editor.scss

@@ -1,8 +1,3 @@
 /**
  * Editor styling
  */
-/**
- * DO NOT CHANGE THIS FILE!
- * To override any of the settings in this section, add your styling code in the custom directory.
- * Loading first in the style.scss and style-editor.scss
- */

assets/sass/style.scss

@@ -1,7 +1,7 @@
 /*
-Theme Name: WP Kit Elementor
+Theme Name: WpKit Elementor
 Theme URI: https://wpkit.pro/themes/wpkit-elementor/
-Description: WP Kit Elementor is a versatile and streamlined WordPress theme meticulously crafted to integrate seamlessly with the Elementor page builder plugin. This free and open-source theme is tailored for users seeking a nimble, user-friendly, and highly customizable website. Engineered for optimal performance, WP Kit Elementor establishes a robust groundwork, empowering users to fashion distinctive designs effortlessly through the intuitive Elementor drag-and-drop site builder. With its user-centric simplicity and adaptable features, WP Kit Elementor stands out as an excellent choice for both novices and seasoned web creators alike.
+Description: WpKitElementor is a versatile and streamlined WordPress theme meticulously crafted to integrate seamlessly with the Elementor page builder plugin. This free and open-source theme is tailored for users seeking a nimble, user-friendly, and highly customizable website. Engineered for optimal performance, WpKitElementor establishes a robust groundwork, empowering users to fashion distinctive designs effortlessly through the intuitive Elementor drag-and-drop site builder. With its user-centric simplicity and adaptable features, WpKitElementor stands out as an excellent choice for both novices and seasoned web creators alike.
 Author: WpKit
 Author URI: https://wpkit.pro
 Version: 1.0.6
@@ -14,8 +14,8 @@ License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Text Domain: wp-kit-elementor
 Tags: blog, e-commerce, one-column, custom-background, custom-colors, full-width-template, custom-menu, custom-logo, featured-images, sticky-post, theme-options, threaded-comments, translation-ready
 
-WP Kit Elementor WordPress Theme, (C) 2023 wpkit.pro
-WP Kit Elementor is distributed under the terms of the GNU GPL.
+WpKitElementor WordPress Theme, (C) 2023 wpkit.pro
+WpKitElementor is distributed under the terms of the GNU GPL.
 */
 
 @import "abstracts/mixins";

assets/sass/theme/_comments.scss

@@ -13,7 +13,7 @@
 		padding: 1.25rem; /* 20/16 */
 		margin-top: 1.25rem; /* 20/16 */
 		margin-bottom: 1.25rem; /* 20/16 */
-		border: 1px solid #e8e8e8;
+		border: 1px solid $light-gray;
 	}
 
 	img {
@@ -30,6 +30,6 @@
 .comment-form-comment {
 	input,
 	textarea {
-		border-color: #e8e8e8;
+		border-color: $light-gray;
 	}
 }

assets/sass/theme/_footer.scss

@@ -1,7 +1,13 @@
 /**
  * Footer styles
  */
+.site-footer {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	padding: 1.875rem 0; /* 30/16 */
+}
+
 .footer-copyright {
 	text-align: center;
-	padding: 1.875rem 0; /* 30/16 */
 }

assets/sass/theme/_header.scss

@@ -14,4 +14,9 @@
 	.site-description {
 		margin: 0;
 	}
+
+	.site-title {
+		font-size: 2.5rem; /* 40/16 */
+		font-weight: 500;
+	}
 }

assets/sass/theme/_navigation.scss

@@ -1,20 +1,16 @@
 /**
  * Navigation styles
  */
-.primary-navigation {
+.site-navigation {
 	ul {
 		display: flex;
 		padding: 0;
 		list-style: none;
-
-		li {
-			margin-bottom: 1.25rem; /* 20/16 */
-		}
 	}
 }
 
 nav {
-	&.primary-navigation {
+	&.site-navigation {
 		text-align: center;
 
 		a, span {
@@ -24,7 +20,7 @@ nav {
 }
 
 .site-logo a,
-.primary-navigation a,
+.site-navigation a,
 .kit-theme-post .read-more a,
 .kit-theme-post .post-title a {
 	text-decoration: none;

assets/sass/theme/_posts-and-pages.scss

@@ -26,7 +26,7 @@
 		align-items: center;
 		justify-content: space-between;
 		padding: 1.25rem 0; /* 20/16 */
-		border-bottom: 1px solid #e8e8e8;
+		border-bottom: 1px solid $light-gray;
 	}
 
 	.read-more {

footer.php

@@ -4,7 +4,7 @@
  *
  * Contains the closing of the #content div and all content after.
  *
- * @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
+ * @link    https://developer.wordpress.org/themes/basics/template-files/#template-partials
  *
  * @package WpKitElementor
  */
@@ -13,30 +13,11 @@
 	exit; // Exit if accessed directly.
 }
 
-$theme_name   = wp_get_theme()->get( 'Name' );
-$theme_author = wp_get_theme()->get( 'Author' );
-$theme_url    = 'https://wpkit.pro';
 ?>
 </div><!-- #content -->
 
-<footer id="colophon" class="site-footer">
+<?php get_template_part( 'template-parts/footer' ); ?>
 
-	<div class="footer-copyright">
-
-		<div class="credit">
-			<?php
-			/* translators: %1$s: theme name, %2$s link, %3$s theme author */
-			echo sprintf( __( '%1$s Theme by <a href="%2$s">%3$s.</a>',
-				'wp-kit-elementor' ), esc_html( $theme_name ),
-				esc_url( $theme_url ),
-				$theme_author
-			);
-			?>
-		</div>
-
-	</div>
-
-</footer><!-- #colophon -->
 </div><!-- #page-wrapper -->
 
 <?php wp_footer(); ?>

functions.php

@@ -18,7 +18,6 @@ function wp_kit_elementor_setup() {
 	// Let WordPress manage the document title for us
 	add_theme_support( 'title-tag' );
 
-
 	// Custom Logo
 	add_theme_support( 'custom-logo', [
 		'height'      => 100,
@@ -27,17 +26,13 @@ function wp_kit_elementor_setup() {
 		'flex-width'  => true,
 	] );
 
-	add_theme_support( 'custom-header' );
-
-	// Add theme support for Custom Background.
-	add_theme_support( 'custom-background', [ 'default-color' => '' ] );
-
 	// Set the default content width.
 	$GLOBALS['content_width'] = 960;
 
 	// This theme uses wp_nav_menu() in one location
 	register_nav_menus( array(
-		'primary' => __( 'Primary Menu', 'wp-kit-elementor' ),
+		'primary' => __( 'Primary', 'wp-kit-elementor' ),
+		'footer'  => __( 'Footer', 'wp-kit-elementor' ),
 	) );
 
 	// Switch default core markup for search form, comment form, and comments to output valid HTML5
@@ -87,7 +82,7 @@ function wp_kit_elementor_scripts() {
 
 	// Theme Stylesheet
 	wp_enqueue_style(
-		'wp-kit-elementor',
+		'wp-kit-elementor-frontend',
 		get_stylesheet_uri(),
 		array(),
 		WPKIT_ELEMENTOR_VERSION
@@ -99,7 +94,7 @@ function wp_kit_elementor_scripts() {
 	}
 
 	wp_enqueue_style(
-		'wp-kit-elementor-theme-style',
+		'wp-kit-elementor-theme',
 		get_stylesheet_directory_uri() . '/theme' . $min_suffix . '.css',
 		array(),
 		WPKIT_ELEMENTOR_VERSION

header.php

@@ -26,7 +26,6 @@
 		<?php esc_html_e( 'Skip to content', 'wp-kit-elementor' ); ?>
 	</a>
 
-
 	<?php get_template_part( 'template-parts/header' ); ?>
 
 	<div id="content" class="site-content">

readme.txt

@@ -3,7 +3,7 @@
 Contributors: wpkit
 Requires at least: 6.4
 Tested up to: 6.4.2
-Requires PHP: 7.4
+Requires PHP: 7.3
 License: GNU General Public License v3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -42,7 +42,7 @@ Source: https://stocksnap.io/photo/BHIL9FV6RK
 
 == Changelog ==
 
-= 1.0.5 - 2024-01-22 =
+= 1.0.6 - 2024-01-22 =
 Fix: Correct function names in wp_kit_elementor theme
 
 = 1.0.5 - 2024-01-21 =
@@ -58,6 +58,9 @@ Fix: Refactor function names in WpKit Elementor theme
 * New: Added new scripts file mode to project
 * New: Define WPKIT_ELEMENTOR_VERSION constant in functions.php
 * New: Add LICENSE file to WP Kit Elementor Theme
+* Tweak: Updated theme metadata in the style.css file
+* Tweak: Add enqueue theme stylesheet code in functions.php
+* Tweak: Refactor theme function file for wp-kit-elementor
 * Tweak: Replace CSS variables with SCSS variables
 * Tweak: Reorganize SCSS imports and add site logo styles
 * Tweak: Refactor and simplify Sass styles in wp-kit-elementor theme
@@ -79,8 +82,8 @@ Fix: Refactor function names in WpKit Elementor theme
 * Update: WP Kit Elementor theme requirements and license info
 * Upgrade: theme requirement and refine copyright details
 * Update: Update WP Kit Elementor theme details
-* Fixed: Remove border style from nav links in wp-kit-elementor theme
-* Fixed: Header template part reference the '.php' extension was removed
+* Fix: Remove border style from nav links in wp-kit-elementor theme
+* Fix: Header template part reference the '.php' extension was removed
 
 = 1.0.2 - 2023-12-22 =
 * New: Added editor style support to wp-kit-elementor theme
@@ -89,7 +92,7 @@ Fix: Refactor function names in WpKit Elementor theme
 * Tweak: Modify alignment in post-footer of wp-kit-elementor theme
 * Tweak: Updated 'bundle' script in wp-kit-elementor theme
 * Tweak: Update package name and improve 404 template in wp-kit-elementor theme
-* Fixed: Fixed style files and add instructions in wp-kit-elementor theme
+* Fix: Fix style files and add instructions in wp-kit-elementor theme
 * Removed: Remove changelog.txt from wp-kit-elementor theme
 * Updated: Update theme metadata and author details
 * Updated: Screenshot image license details in readme
@@ -100,26 +103,22 @@ Fix: Refactor function names in WpKit Elementor theme
 * Update version number in wpkit-elementor theme
 * Update README files and package details for WPKit Elementor theme
 * Update SDK class with improved exception handling
-* Fixed: Text domain in 404.php
-* Fixed: 'esc_html_e' to 'esc_attr__' in header.php
+* Fix: Text domain in 404.php
+* Fix: 'esc_html_e' to 'esc_attr__' in header.php
 
 = 1.0.0 - 2023-12-03 =
+* New: Add comments.php for WP Kit Elementor theme
 * Tweak: Update theme name and version, refine bundle script
-* Updated: Update theme version and fix CSS selectors
 * Tweak: Refactor wpkit-elementor theme index template
 * Tweak: Remove unused template parts from theme
 * Tweak: Extend page rendering in wpkit-elementor theme
-* Fixed: Fix typo in class name in style.scss
-* Fixed: Refactor CSS class name in style.scss
 * Tweak: Update dependencies in package.json & package-lock.json
 * Tweak: Update package.json with bundling and translation tasks
 * Tweak: Update template structure and improve accessibility in page.php
 * Tweak: Update skip link target and change content wrapper in header.php
 * Tweak: Rename package name and change main content wrapper in footer.php
 * Tweak: Update main content accessibility and documentation
-* Added: Add comments.php for WP Kit Elementor theme
 * Tweak: Update theme information in style.css
-* Removed: Remove unused custom template in WPKit
 * Added: Add sidebar.php to avoid Deprecated Message
 * Tweak: Rename LICENSE.md to LICENSE and update copyright
 * Tweak: Add footer documentation to footer.php
@@ -137,6 +136,10 @@ Fix: Refactor function names in WpKit Elementor theme
 * Tweak: Remove setup.php and template-functions.php
 * Tweak: Refactored file paths and updated theme details
 * Tweak: Remove excessive CSS styling from WPKit theme
+* Updated: Update theme version and fix CSS selectors
+* Fix: Fix typo in class name in style.scss
+* Fix: Refactor CSS class name in style.scss
+* Removed: Remove unused custom template in WPKit
 
 = 0.0.1 - 2023-12-03 =
 * Initial Public Release

template-parts/footer.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * The template for displaying footer.
+ *
+ * @package WpKitElementor
+ */
+
+$theme_name   = wp_get_theme()->get( 'Name' );
+$theme_author = wp_get_theme()->get( 'Author' );
+$theme_url    = wp_get_theme()->get( 'AuthorURI' );
+
+$footer_nav_menu = wp_nav_menu( array(
+	'theme_location' => 'footer',
+	'fallback_cb'    => false,
+	'echo'           => false,
+) );
+?>
+<footer id="colophon" class="site-footer">
+
+	<?php if ( $footer_nav_menu ): ?>
+		<nav class="site-navigation">
+			<?php
+			// PHPCS - escaped by WordPress with "wp_nav_menu"
+			echo $footer_nav_menu;  // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+			?>
+		</nav>
+	<?php endif; ?>
+
+	<div class="footer-copyright">
+
+		<div class="credit">
+			<?php
+			/* translators: %1$s: theme name, %2$s link, %3$s theme author */
+			echo sprintf( __( '%1$s Theme by <a href="%2$s">%3$s.</a>',
+				'wp-kit-elementor' ), esc_html( $theme_name ),
+				esc_url( $theme_url ),
+				$theme_author
+			);
+			?>
+		</div>
+
+	</div>
+
+</footer><!-- #colophon -->

template-parts/header.php

@@ -34,10 +34,7 @@
 
 		<?php endif; // Endif has_custom_logo() ?>
 	</div>
-	<nav id="site-navigation"
-		 class="primary-navigation"
-		 aria-label="<?php esc_attr_e( 'Primary menu', 'wp-kit-elementor' ); ?>"
-	>
+	<nav class="site-navigation" aria-label="<?php esc_attr_e( 'Primary navigation', 'wp-kit-elementor' ); ?>">
 		<?php if ( has_nav_menu( 'primary' ) ) { ?>
 			<?php wp_nav_menu( [ 'theme_location' => 'primary' ] ); ?>
 		<?php } // Endif has_nav_menu('primary') ?>

webpack.config.js

@@ -10,9 +10,8 @@ const CopyPlugin = require( 'copy-webpack-plugin' );
 const TerserPlugin = require( 'terser-webpack-plugin' );
 
 const entry = {
-	'kit-frontend': path.resolve( __dirname, './assets/scripts/frontend/kit-frontend.js' ),
-	'kit-editor': path.resolve( __dirname, './assets/scripts/editor/kit-editor.js' ),
-	'kit-admin': path.resolve( __dirname, './assets/scripts/admin/kit-admin.js' ),
+	'wpkit-frontend': path.resolve( __dirname, './assets/scripts/frontend/wpkit-frontend.js' ),
+	'wpkit-editor': path.resolve( __dirname, './assets/scripts/editor/wpkit-editor.js' ),
 }
 
 const copyPluginConfig = new CopyPlugin( {