Merge pull request #182 from uriweb/release-2.0.1

Release 2.0.1

.eslintrc.json

@@ -0,0 +1,24 @@
+{
+  "env": {
+    "es6": true,
+    "browser": true
+  },
+  "extends": [ "plugin:@wordpress/eslint-plugin/recommended" ],
+  "rules": {
+    "no-undef": ["warn"],
+    "no-unused-vars": ["warn"],
+    "no-bitwise": ["warn"],
+    "no-alert": ["warn"],
+    "no-console": [ "error", { "allow": ["warn", "error"] } ],
+    "jsx-a11y/label-has-associated-control": ["warn"],
+    "jsx-a11y/label-has-for": [0]
+  },
+  "ignorePatterns": [
+    "node_modules/",
+    "gulpfile.js",
+    "js/script.min.js",
+    "js/block-editor.min.js",
+    "js/smoothscroll.min.js",
+    "static/**"
+  ]
+}

.sniff

@@ -2,16 +2,17 @@
 
 ignore=node_modules,work_files,gulpfile.js,js/script.min.js,js/smoothscroll.min.js,js/block-editor.min.js
 ruleset=.codesniffer.ruleset.xml
+extensions=php
 warn=-n
 
 if hash phpcs 2>/dev/null; then
 
     echo Running php code beautifier...
-    phpcbf --standard=$ruleset --ignore=$ignore $warn .
+    phpcbf --standard=$ruleset --ignore=$ignore --extensions=$extensions $warn .
     echo done beautifying.
 
     echo Running php codesniffer...
-    phpcs --standard=$ruleset --ignore=$ignore $warn .
+    phpcs --standard=$ruleset --ignore=$ignore --extensions=$extensions $warn .
     echo done sniffing.
 
     echo done with sniff.

.travis.yml

@@ -18,6 +18,7 @@ branches:
     only:
     - master
     - develop
+    - /^dev-.*$/
     - /^travis-.*$/
 
 # Declare which versions of WordPress to test against.
@@ -68,15 +69,17 @@ before_script:
     - cd $theme_dir
     # After CodeSniffer install you should refresh your path.
     - phpenv rehash
-    # Install JSCS: JavaScript Code Style checker
-    - npm install -g jscs
+    # Install ESLint
+    - npm install -g eslint
+    # Install WP JS standards
+    - npm install @wordpress/eslint-plugin --save-dev
 
 # Run test script commands.
 script:
     # Search theme for PHP syntax errors.
     - find . \( -name '*.php' \) -exec php -lf {} \;
     # Run the theme through JavaScript Code Style checker
-    - jscs .
+    - eslint .
     # WordPress Coding Standards
     # @link https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
     # @link http://pear.php.net/package/PHP_CodeSniffer/

README.md

@@ -2,29 +2,22 @@
 
 URI Modern is a WordPress theme designed for the University of Rhode Island. It's designed to replace all themes currently being used on the university's websites, and unify the online brand and experience.
 
-## What's new in 2.0.0
+## What's new in 2.0.1
 
-URI Modern 2.0.0 is a major release focused on style refinements and improving core functionality.
+URI Modern 2.0.1 is bug fix release.
 
-### A Refined Look
+* Adds styles for default Gutenberg blocks
+* Removes certain Gutenberg functionality that is either duplicated by the [Component Library](https://github.com/uriweb/uri-component-library) or discouraged by URI web design practices
+  - Removes button, quote, and pull quote Gutenberg blocks
+  - Removes custom colors, font sizes, and drop caps
+  - Removes circular image option, striped tables, and wide separators
+* Adds styles for Component Library date and promo components
+* Removes button styles on Component Library panels formatted as `super`
+* Fixes an issue with breadcrumbs on paginated posts
+* All scripts are now linted with ESLint; JSCS and JSHint have been removed
+* Updates development tools
 
-The [URI Component Library](https://github.com/uriweb/uri-component-library) v4.0 and later relies on themes to control the look and feel of components beyond the general styles provided out-of-the-box.  URI Modern introduces a refined look for components, as well as other widely-used elements of the theme.
-
-* Introduces a refined look for several components — most notably cards, buttons, and tabs
-* Introduces a refined look for site menus and brand bar elements
-* Adds styles for definition lists
-
-### General Improvements
-
-* Improves theme support for the Gutenberg block editor, including previewing theme fonts, background colors, and page title visibility
-* Improves responsiveness of certain oEmbed elements
-* Adds a `button-list` CSS class for styling vertical groups of buttons
-* Removes accessibility and code error checking (install the [URI Code Compliance](https://github.com/uriweb/uri-code-compliance) plugin instead)
-* Fixes an issue in breadcrumbs that caused the current post to not be included
-* Other bug fixes
-* Updates devDependencies
-
-For complete details, see the [commit history](https://github.com/uriweb/uri-modern/pull/179/commits) and the [issue tracker](https://github.com/uriweb/uri-modern/issues).
+For complete details, see the [commit history](https://github.com/uriweb/uri-modern/pull/182/commits) and the [issue tracker](https://github.com/uriweb/uri-modern/issues).
 
 ## How do I get set up?
 
@@ -46,4 +39,4 @@ Contributors: Brandon Fuller, John Pennypacker
 Tags: themes  
 Requires at least: 4.0  
 Tested up to: 5.3  
-Stable tag: 2.0.0  
+Stable tag: 2.0.1  

gulpfile.js

@@ -29,8 +29,7 @@ var bannerStatic = ['/*',
   ''].join('\n');
 
 // include plug-ins
-var jshint = require('gulp-jshint');
-var jscs = require('gulp-jscs');
+var eslint = require('gulp-eslint');
 var changed = require('gulp-changed');
 var imagemin = require('gulp-imagemin');
 var rename = require('gulp-rename');
@@ -57,12 +56,8 @@ gulp.task('scripts', scripts);
 function scripts(done) {
 
   gulp.src('./src/js/**/*.js')
-    .pipe(jshint(done))
-    .pipe(jshint.reporter('default'));
-
-  gulp.src('./src/js/**/*.js')
-    .pipe(jscs(done))
-    .pipe(jscs.reporter());
+    .pipe(eslint(done))
+    .pipe(eslint.format());
 
   // Process top-level js (front side)
   gulp.src('./src/js/*.js')

inc/get-breadcrumbs.php

@@ -44,7 +44,7 @@ function uri_modern_breadcrumbs() {
 		$path = $path . '/' . $p;
 		$link = uri_modern_breadcrumbs_get_link( $path );
 
-		if ( null != $link ) {
+		if ( ! empty( $link ) ) {
 			$crumbs[] = $link;
 		}
 	}
@@ -69,6 +69,9 @@ function uri_modern_breadcrumbs_get_link( $path ) {
 
 	if ( 0 !== $post_id ) { // it's a post or a page.
 		$p      = get_page_by_path( $path );
+		if ( ! is_object( $p ) ) { // solves an issue with page break paginated pages and posts
+			return;
+		}
 		$output = array(
 			'name' => get_the_title( $p->ID ),
 			'href' => get_site_url() . $path,

inc/gutenberg.php

@@ -32,10 +32,10 @@ function uri_modern_allowed_blocks( $allowed_blocks, $post ) {
 		'core/paragraph',
 		'core/image',
 		'core/heading',
-		'core/subhead',
+		// 'core/subhead',
 		'core/gallery',
 		'core/list',
-		'core/quote',
+		// 'core/quote',
 		'core/audio',
 		'core/cover', // previously core/cover-image
 		'core/file',
@@ -47,9 +47,9 @@ function uri_modern_allowed_blocks( $allowed_blocks, $post ) {
 		'core/freeform', // Classic
 		'core/html', // Custom HTML
 		'core/preformatted',
-		'core/pullquote',
+		// 'core/pullquote',
 		// layout
-		'core/button',
+		// 'core/button',
 		'core/columns',
 		'core/media-text',
 		'core/more',
@@ -126,90 +126,45 @@ function uri_modern_allowed_blocks( $allowed_blocks, $post ) {
 
 
 
-
-
 // COLORS //
 // disable option for custom colors
 add_theme_support( 'disable-custom-colors' );
+// register custom palette with no colors to hide the color options entirely
+add_theme_support( 'editor-color-palette' );
 
-// Adds support for editor color palette.
-add_theme_support(
-	'editor-color-palette',
-	array(
-		array(
-			'name'  => __( 'URI Blue', 'uri' ),
-			'slug'  => 'uri-gray',
-			'color' => '#002147',
-		),
-		array(
-			'name'  => __( 'Light Blue', 'uri' ),
-			'slug'  => 'light-blue',
-			'color' => '#c0ddf2',
-		),
-		array(
-			'name'  => __( 'Keaney Blue', 'uri' ),
-			'slug'  => 'keaney-blue',
-			'color' => '#2277b3',
-		),
-		array(
-			'name'  => __( 'Dark Blue', 'uri' ),
-			'slug'  => 'dark-blue',
-			'color' => '#001228',
-		),
-		array(
-			'name'  => __( 'URI Gold', 'uri' ),
-			'slug'  => 'uri-gold',
-			'color' => '#b5985a',
-		),
-		array(
-			'name'  => __( 'Mid Gold', 'uri' ),
-			'slug'  => 'mid-gold',
-			'color' => '#ffd453',
-		),
-		array(
-			'name'  => __( 'Light Gold', 'uri' ),
-			'slug'  => 'light-gold',
-			'color' => '#fefada',
-		),
-		array(
-			'name'  => __( 'URI Gray', 'uri' ),
-			'slug'  => 'uri-gray',
-			'color' => '#dddddd',
-		),
-		array(
-			'name'  => __( 'Light Gray', 'uri' ),
-			'slug'  => 'light-gray',
-			'color' => '#fafafa',
-		),
-		array(
-			'name'  => __( 'Mid Gray', 'uri' ),
-			'slug'  => 'mid-gray',
-			'color' => '#999999',
-		),
-		array(
-			'name'  => __( 'Dark Gray', 'uri' ),
-			'slug'  => 'dark-gray',
-			'color' => '#555555',
-		),
-		array(
-			'name'  => __( 'White', 'uri' ),
-			'slug'  => 'white',
-			'color' => '#fff',
-		),
-		array(
-			'name'  => __( 'Black', 'uri' ),
-			'slug'  => 'black',
-			'color' => '#000',
-		),
-		array(
-			'name'  => __( 'Link Blue', 'uri' ),
-			'slug'  => 'link-blue',
-			'color' => '#005eff',
-		),
+
+/**
+ * Removes the dropcap widget with a little injected css.
+ */
+function uri_modern_hide_font_styles() {
+	// https://github.com/WordPress/gutenberg/issues/6184
+	// hide dropcap only
+	// echo '<style>.blocks-font-size .components-base-control:first-of-type { margin-bottom: 0; } .blocks-font-size .components-toggle-control { display: none; }</style>';
+	// hide the entire font size section
+	echo '<style>.blocks-font-size * { display: none; } .blocks-font-size { border: 0 !important; height: 0; padding: 0 !important; margin-top: 32px !important; }</style>';
+}
+add_action( 'admin_head', 'uri_modern_hide_font_styles' );
+
+
+/**
+ * Removes options for different font sizes
+ * Not in use since we're using CSS to hide the entire pane
+ *
+ * @see uri_modern_hide_font_styles
+ */
+function uri_modern_set_font_sizes() {
+	// removes the text box where users can enter custom pixel sizes
+	add_theme_support( 'disable-custom-font-sizes' );
+	// forces the dropdown for font sizes to only contain "normal"
+	add_theme_support(
+		'editor-font-sizes',
 		array(
-			'name'  => __( 'Link Hover Blue', 'uri' ),
-			'slug'  => 'link-hover-blue',
-			'color' => '#003287',
-		),
-	)
-);
+			array(
+				'name' => 'Normal',
+				'size' => 20,
+				'slug' => 'normal',
+			),
+		)
+	);
+}
+// add_action( 'after_setup_theme', 'uri_modern_set_font_sizes' );

js/customizer.js

@@ -9,7 +9,6 @@
  */
 
 ( function( $ ) {
-
 	// Site title and description.
 	wp.customize(
 		'blogname',
@@ -41,25 +40,25 @@
 					if ( 'blank' === to ) {
 						$( '.site-title a, .site-description' ).css(
 							{
-								'clip': 'rect(1px, 1px, 1px, 1px)',
-								'position': 'absolute'
+								clip: 'rect(1px, 1px, 1px, 1px)',
+								position: 'absolute',
 							}
 						);
 					} else {
 						$( '.site-title a, .site-description' ).css(
 							{
-								'clip': 'auto',
-								'position': 'relative'
+								clip: 'auto',
+								position: 'relative',
 							}
 						);
 						$( '.site-title a, .site-description' ).css(
 							{
-								'color': to
+								color: to,
 							}
 						);
 					}
 				}
 			);
 		}
 	);
-} )( jQuery );
+}( jQuery ) );