diff --git a/Gruntfile.js b/Gruntfile.js index 32c0521..e2cdb0c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -2,18 +2,21 @@ module.exports = function(grunt) { grunt.initConfig({ - + // js minification terser: { dist: { files: { // admin scripts - 'inc/js/yikes-theme-scripts.min.js': [ // theme specific script + 'inc/js/yikes-theme-scripts.min.js': [ // theme specific scripts 'inc/js/navigation.js' , 'inc/js/skip-link-focus-fix.js' , 'inc/js/lwtv-theme-scripts.js' , 'inc/js/a11y.js' ], - 'inc/js/customizer.min.js': [ // customizer specific script + 'inc/js/customizer.min.js': [ // customizer specific script 'inc/js/customizer.js' ], + 'inc/js/bootstrap-color-mode.min.js': [ // bootstrap color mode script + 'inc/js/bootstrap-color-mode.js' + ], } } }, @@ -29,7 +32,7 @@ module.exports = function(grunt) { } } }, - + // css minify contents of our directory and add .min.css extension cssmin: { target: { diff --git a/archive-post_type_actors.php b/archive-post_type_actors.php index 82083a5..f4d3b08 100644 --- a/archive-post_type_actors.php +++ b/archive-post_type_actors.php @@ -58,10 +58,10 @@ /* Start the Loop */ while ( have_posts() ) : the_post(); - get_template_part( 'template-parts/excerpt', 'post_type_actors', array( 'actor' => get_the_ID() ) ); + get_template_part( 'template-parts/excerpt/actors', '', array( 'actor' => get_the_ID() ) ); endwhile; } else { - get_template_part( 'template-parts/content', 'none' ); + get_template_part( 'template-parts/content/none' ); } ?> diff --git a/archive-post_type_characters.php b/archive-post_type_characters.php index bca1b18..e0fa429 100644 --- a/archive-post_type_characters.php +++ b/archive-post_type_characters.php @@ -59,10 +59,10 @@ /* Start the Loop */ while ( have_posts() ) { the_post(); - get_template_part( 'template-parts/excerpt', 'post_type_characters', array( 'character' => get_the_ID() ) ); + get_template_part( 'template-parts/excerpt/characters', '', array( 'character' => get_the_ID() ) ); } } else { - get_template_part( 'template-parts/content', 'none' ); + get_template_part( 'template-parts/content/none' ); } ?> diff --git a/archive-post_type_shows.php b/archive-post_type_shows.php index 85d5a8d..2ea9a4c 100644 --- a/archive-post_type_shows.php +++ b/archive-post_type_shows.php @@ -60,10 +60,10 @@ /* Start the Loop */ while ( have_posts() ) { the_post(); - get_template_part( 'template-parts/excerpt', 'post_type_shows' ); + get_template_part( 'template-parts/excerpt/shows' ); } } else { - get_template_part( 'template-parts/content', 'none' ); + get_template_part( 'template-parts/content/none' ); } ?> diff --git a/archive.php b/archive.php index f157f77..137ff22 100644 --- a/archive.php +++ b/archive.php @@ -78,10 +78,10 @@ diff --git a/embed.php b/embed.php index f0d103c..aa741be 100644 --- a/embed.php +++ b/embed.php @@ -17,10 +17,8 @@ the_post(); switch ( get_post_type() ) { - //case 'post_type_actors': - //case 'post_type_characters': case 'post_type_shows': - get_template_part( 'template-parts/embed-content', get_post_type() ); + get_template_part( 'template-parts/embed/' . get_post_type() ); break; default: get_template_part( 'embed', 'content' ); diff --git a/footer.php b/footer.php index f525c98..7c8a6d9 100644 --- a/footer.php +++ b/footer.php @@ -47,7 +47,10 @@ diff --git a/functions.php b/functions.php index ce98827..977b0e8 100644 --- a/functions.php +++ b/functions.php @@ -24,9 +24,10 @@ function lwtv_admin_notice_missing_plugin() { // Versioning for efficient developers. if ( ! defined( 'LWTV_THEME_VERSION' ) ) { $versions = array( - 'lwtv-underscores' => '6.0.5', // Bump this any time you make serious CSS changes. + 'lwtv-underscores' => '6.1.1', // Bump this any time you make serious CSS changes. 'font-awesome' => '6.5.2', // Bump when you update Font Awesome. 'bootstrap' => '5.3.3', // Bump when you update bootstrap. + 'bootstrap_dark' => '1.0', // Bump when you update the dark mode. 'lwtv-blocks' => '1.0.0', // Bump when you update the blocks. 'yikes-nav' => '20240318', // Last date this was updated. ); @@ -125,7 +126,9 @@ function lwtv_custom_excerpt_length( $length ) { * * Add bio box. */ -require_once 'inc/author-box.php'; +if ( ! is_singular( 'post' ) ) { + require_once 'inc/author-box.php'; +} /** * Archives @@ -396,11 +399,13 @@ function yikes_starter_scripts() { $lwtv_underscores = $get_theme_vers['lwtv-underscores']; $font_awesome = $get_theme_vers['font-awesome']; $bootstrap = $get_theme_vers['bootstrap']; + $bootstrap_dark = $get_theme_vers['bootstrap_dark']; $yikes_nav = $get_theme_vers['yikes-nav']; // combined + minified. - // navigation.js, skip-link-focus-fix.js & a11y.js. + // navigation.js, skip-link-focus-fix.js, a11y.js, bootstrap-color-mode. wp_enqueue_script( 'yikes-starter-navigation', get_template_directory_uri() . '/inc/js/yikes-theme-scripts.min.js', array(), $yikes_nav, true ); + wp_enqueue_script( 'lwtv-dark-mode', get_template_directory_uri() . '/inc/js/bootstrap-color-mode.min.js', array(), $bootstrap_dark, false ); if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) { wp_enqueue_script( 'comment-reply' ); diff --git a/header.php b/header.php index 82047a1..df0089b 100644 --- a/header.php +++ b/header.php @@ -13,7 +13,7 @@ - get_the_ID() ) ); ?> + get_the_ID() ) ); ?> @@ -21,45 +21,8 @@ >