Merge pull request #268 from studiopress/develop

Genesis Sample 3.0.0 release

.eslintignore

@@ -1,4 +1,3 @@
 node_modules
 vendor
 *.min.js
-js/responsive-menus.js

.github/ISSUE_TEMPLATE/release.md

@@ -10,7 +10,7 @@ assignees: ''
 **Update version**
 - [ ] style.css
 - [ ] package.json
-- [ ] .pot file (regenerate)
+- [ ] .pot file (`npm install` then `npm run makepot`)
 - [ ] Changelog (include changes)
 
 **Check standards**

CHANGELOG.md

@@ -1,5 +1,28 @@
 # Genesis Sample Theme Changelog
 
+## [3.0.0] - 2019-06-19
+Requires Genesis 3.0.0+.
+
+### Added
+* AMP support. (Optional, off by default, requires Genesis 3.0.0 and the [AMP plugin](https://wordpress.org/plugins/amp/).)
+* New `composer run phpcbf` command to fix simple PHP linting violations. ([GitHub version](https://github.com/studiopress/genesis-sample/) only.)
+
+### Changed
+* Use `position: sticky` for the header and remove JavaScript that adjusted header height and content position. This prevents content reflow after page load.
+* Reorganized config folder for easier reading and maintenance.
+* Use new `genesis_get_theme_handle()` and `genesis_get_theme_version()` functions from Genesis 3.0.0 in place of declaring `CHILD_THEME_HANDLE` and `CHILD_THEME_VERSION` constants.
+* Update developer dependencies.
+
+### Fixed
+* Improved block column CSS for WordPress 5.2+.
+
+### Removed
+* Responsive menu scripts have been replaced with `genesis_register_responsive_menus()`, which loads required JavaScript from Genesis 3.0.0.
+* `genesis-responsive-viewport` theme support declaration. This is now added by default in Genesis 3.0.0.
+* Deleted Genesis nav extras filter and metabox removal. These are no longer present in Genesis 3.0.0.
+* `child-theme-settings-genesis.php` file and filter. Genesis 3.0.0 no longer includes a settings admin page or `genesis_theme_settings_defaults` filter. 
+* `404-page` accessibility support, as this no longer has an effect.
+
 ## [2.10.0] - 2019-05-01
 Requires Genesis 2.10.0+.
 
@@ -116,10 +139,14 @@ Requires Genesis 2.8.0+.
 * Set localization.
 * Update XML file.
 
-[2.8.0]: https://github.com/copyblogger/genesis-sample/compare/2.7.1...2.8.0
-[2.7.1]: https://github.com/copyblogger/genesis-sample/compare/2.7.0...2.7.1
-[2.7.0]: https://github.com/copyblogger/genesis-sample/compare/2.6.0...2.7.0
-[2.6.0]: https://github.com/copyblogger/genesis-sample/compare/2.3.0...2.6.0
-[2.3.0]: https://github.com/copyblogger/genesis-sample/compare/2.2.4...2.3.0
-[2.2.4]: https://github.com/copyblogger/genesis-sample/compare/2.2.3...2.2.4
-[2.2.3]: https://github.com/copyblogger/genesis-sample/compare/014deb3689323b7bbd4ddbfff4f5f9279a38f741...2.2.3
+[3.0.0]: https://github.com/studiopress/genesis-sample/compare/2.10.0...3.0.0
+[2.10.0]: https://github.com/studiopress/genesis-sample/compare/2.9.1...2.10.0
+[2.9.1]: https://github.com/studiopress/genesis-sample/compare/2.9.0...2.9.1
+[2.9.0]: https://github.com/studiopress/genesis-sample/compare/2.8.0...2.9.0
+[2.8.0]: https://github.com/studiopress/genesis-sample/compare/2.7.1...2.8.0
+[2.7.1]: https://github.com/studiopress/genesis-sample/compare/2.7.0...2.7.1
+[2.7.0]: https://github.com/studiopress/genesis-sample/compare/2.6.0...2.7.0
+[2.6.0]: https://github.com/studiopress/genesis-sample/compare/2.3.0...2.6.0
+[2.3.0]: https://github.com/studiopress/genesis-sample/compare/2.2.4...2.3.0
+[2.2.4]: https://github.com/studiopress/genesis-sample/compare/2.2.3...2.2.4
+[2.2.3]: https://github.com/studiopress/genesis-sample/compare/014deb3689323b7bbd4ddbfff4f5f9279a38f741...2.2.3

README.md

@@ -25,6 +25,8 @@ The version of [Genesis Sample on GitHub](https://github.com/studiopress/genesis
 
 You'll see output highlighting issues with PHP files that do not conform to Genesis Sample coding standards.
 
+Run `composer phpcbf` if you see “phpcbf can fix the x marked sniff violations automatically” in the output of `composer phpcs`.
+
 ### npm scripts
 
 Scripts are also provided to help with CSS linting, CSS autoprefixing, and creation of pot language files. To use them:

composer.json

@@ -26,7 +26,8 @@
 	},
 	"scripts": {
 		"install-codestandards": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run",
-		"phpcs": "phpcs"
+		"phpcs": "phpcs",
+		"phpcbf": "phpcbf"
 	},
 	"support": {
 		"issues": "https://github.com/studiopress/genesis-sample/issues",

config/block-editor-settings.php → config/appearance.php

@@ -1,37 +1,52 @@
 <?php
 /**
- * Block Editor settings specific to Genesis Sample.
+ * Genesis Sample appearance settings.
  *
  * @package Genesis Sample
  * @author  StudioPress
  * @license GPL-2.0-or-later
  * @link    https://www.studiopress.com/
  */
 
-$genesis_sample_link_color            = get_theme_mod( 'genesis_sample_link_color', genesis_sample_customizer_get_default_link_color() );
+$genesis_sample_default_colors = array(
+	'link'   => '#0073e5',
+	'accent' => '#0073e5',
+);
+
+$genesis_sample_link_color = get_theme_mod(
+	'genesis_sample_link_color',
+	$genesis_sample_default_colors['link']
+);
+
+$genesis_sample_accent_color = get_theme_mod(
+	'genesis_sample_accent_color',
+	$genesis_sample_default_colors['accent']
+);
+
 $genesis_sample_link_color_contrast   = genesis_sample_color_contrast( $genesis_sample_link_color );
 $genesis_sample_link_color_brightness = genesis_sample_color_brightness( $genesis_sample_link_color, 35 );
 
 return array(
-	'admin-fonts-url'              => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700',
-	'content-width'                => 1062,
-	'default-button-bg'            => $genesis_sample_link_color,
-	'default-button-color'         => $genesis_sample_link_color_contrast,
-	'default-button-outline-hover' => $genesis_sample_link_color_brightness,
-	'default-link-color'           => $genesis_sample_link_color,
-	'editor-color-palette'         => array(
+	'fonts-url'            => 'https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,700&display=swap',
+	'content-width'        => 1062,
+	'button-bg'            => $genesis_sample_link_color,
+	'button-color'         => $genesis_sample_link_color_contrast,
+	'button-outline-hover' => $genesis_sample_link_color_brightness,
+	'link-color'           => $genesis_sample_link_color,
+	'default-colors'       => $genesis_sample_default_colors,
+	'editor-color-palette' => array(
 		array(
 			'name'  => __( 'Custom color', 'genesis-sample' ), // Called “Link Color” in the Customizer options. Renamed because “Link Color” implies it can only be used for links.
 			'slug'  => 'theme-primary',
-			'color' => get_theme_mod( 'genesis_sample_link_color', genesis_sample_customizer_get_default_link_color() ),
+			'color' => $genesis_sample_link_color,
 		),
 		array(
 			'name'  => __( 'Accent color', 'genesis-sample' ),
 			'slug'  => 'theme-secondary',
-			'color' => get_theme_mod( 'genesis_sample_accent_color', genesis_sample_customizer_get_default_accent_color() ),
+			'color' => $genesis_sample_accent_color,
 		),
 	),
-	'editor-font-sizes'            => array(
+	'editor-font-sizes'    => array(
 		array(
 			'name' => __( 'Small', 'genesis-sample' ),
 			'size' => 12,

config/child-theme-settings.php

@@ -11,6 +11,23 @@
  */
 
 return array(
-	GENESIS_SETTINGS_FIELD => genesis_get_config( 'child-theme-settings-genesis' ),
+	GENESIS_SETTINGS_FIELD => array(
+		'blog_cat_num'              => 6,
+		'breadcrumb_home'           => 0,
+		'breadcrumb_front_page'     => 0,
+		'breadcrumb_posts_page'     => 0,
+		'breadcrumb_single'         => 0,
+		'breadcrumb_page'           => 0,
+		'breadcrumb_archive'        => 0,
+		'breadcrumb_404'            => 0,
+		'breadcrumb_attachment'     => 0,
+		'content_archive'           => 'full',
+		'content_archive_limit'     => 0,
+		'content_archive_thumbnail' => 0,
+		'image_size'                => '',
+		'image_alignment'           => 'alignleft',
+		'posts_nav'                 => 'numeric',
+		'site_layout'               => 'content-sidebar',
+	),
 	'posts_per_page'       => 6,
 );

config/accessibility.php → config/responsive-menus.php

@@ -9,12 +9,15 @@
  */
 
 /**
- * Genesis Accessibility features to support.
+ * Genesis responsive menus settings. (Requires Genesis 3.0+.)
  */
 return array(
-	'404-page',
-	'drop-down-menu',
-	'headings',
-	'search-form',
-	'skip-links',
+	'script' => array(
+		'menuClasses' => array(
+			'others' => array( '.nav-primary' ),
+		),
+	),
+	'extras' => array(
+		'media_query_width' => '960px',
+	),
 );

config/theme-supports.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Genesis Sample child theme.
+ *
+ * Theme supports.
+ *
+ * @package Genesis Sample
+ * @author  StudioPress
+ * @license GPL-2.0-or-later
+ * @link    https://my.studiopress.com/themes/genesis-sample/
+ */
+
+return array(
+	'custom-logo'                     => array(
+		'height'      => 120,
+		'width'       => 700,
+		'flex-height' => true,
+		'flex-width'  => true,
+	),
+	'html5'                           => array(
+		'caption',
+		'comment-form',
+		'comment-list',
+		'gallery',
+		'search-form',
+	),
+	'genesis-accessibility'           => array(
+		'drop-down-menu',
+		'headings',
+		'search-form',
+		'skip-links',
+	),
+	'genesis-after-entry-widget-area' => '',
+	'genesis-footer-widgets'          => 3,
+	'genesis-menus'                   => array(
+		'primary'   => __( 'Header Menu', 'genesis-sample' ),
+		'secondary' => __( 'Footer Menu', 'genesis-sample' ),
+	),
+);