1.1.1 (#39)

* Update npm packages and Gruntfile

* Add image license to readme.txt

* Add replace:charset to the watch:sass Grunt.js task (#34)

* WordPress 4.9.6 Support (#38)

* Introduce styles for cookie comment checkbox & privacy policy footer link

* Run replace:charset

* Update readme, update travis deploy

* Bump tested up to version

.dev/sass/layouts/_comments.scss

@@ -19,6 +19,21 @@
 	textarea {
 		width: 100%;
 	}
+
+	.comment-form-cookies-consent {
+		display: flex;
+		line-height: 16px;
+
+		#wp-comment-cookies-consent {
+			display: inline;
+			width: auto;
+			margin: 0 10px 0 0;
+
+			@media #{$small-only} {
+				margin-top: 2px;
+			}
+		}
+	}
 }
 
 .comment-list {

.dev/sass/layouts/_footer.scss

@@ -85,11 +85,13 @@ body.no-max-width .footer-widget-area {
 		@include container($container-size);
 	}
 
+	.privacy-policy-link,
 	.site-info-text {
 		font-size: 90%;
 		line-height: 38px;
 	}
 
+	.privacy-policy-link,
 	.site-info-text,
 	.footer-nav,
 	.social-menu {

.travis.yml

@@ -1,29 +1,58 @@
 sudo: false
 
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+
+cache:
+  directories:
+    - node_modules
+    - vendor
+    - $HOME/.composer/cache
+    - $HOME/.wp-cli/cache
+    - $HOME/.wp-cli/packages/cache
+
 language:
   - php
   - node_js
 
+branches:
+  only:
+    - /^v\d.*$/
+    - master
+    - develop
+
+env:
+  global:
+    - WP_THEME=uptown-style
+
+before_install:
+  - phpenv config-rm xdebug.ini
+
 before_script:
-  - curl -s https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli-nightly.phar > /tmp/wp-cli.phar
+  - curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli-nightly.phar > /tmp/wp-cli.phar
+  - chmod +x /tmp/wp-cli.phar
 
 script:
   - echo "Deploy only"
 
 before_deploy:
-  - export RELEASE_FOLDER=uptown-style
-  - php /tmp/wp-cli.phar package install runcommand/dist-archive
-  - cp -rv ${TRAVIS_BUILD_DIR} /tmp/${RELEASE_FOLDER}
-  - mv /tmp/${RELEASE_FOLDER} ${TRAVIS_BUILD_DIR}
-  - php /tmp/wp-cli.phar dist-archive ${RELEASE_FOLDER} ${TRAVIS_BUILD_DIR}/${RELEASE_FOLDER}.zip --format=zip --debug
+  - mkdir -p /tmp/$WP_THEME
+  - rsync -av --exclude-from $TRAVIS_BUILD_DIR/.distignore --delete $TRAVIS_BUILD_DIR/ /tmp/$WP_THEME/
+  - cd /tmp
+  - zip -rT $TRAVIS_BUILD_DIR/$WP_THEME.zip $WP_THEME/
+  - sha256sum -b $TRAVIS_BUILD_DIR/$WP_THEME.zip | awk '{print $1}' | tee $TRAVIS_BUILD_DIR/$WP_THEME.zip.sha256
 
 deploy:
   provider: releases
   api_key:
-    secure: Y6mWxcVwPJvGTsgfEexathGOFbIIU+ihLVyzUK0hLndcNnk74Op3ZeDS5dymS9VobpAbaMIbko+Jlyua5cHkkgV89kkPXoW6auY1GRywMkYAGOoBzrFoHMBNFlbh6R55UDNDfxglIwv61iepe/LiXyYuuvNPmzi6nNH6B+d58AaV9DpPs5r8GJR/SL5jl2sqeJPcPyu5TycqfUiXEgijrvS6/bXlALkXRH12Qfq1T9ccgGZprLt6MM42YMnxiE+dGH5md6ReAzHbO6T8fHQOgA7dCiv+wk/jjoYaU7JMaCGgJ/GohAjcALoqav9rJMFxwi7aI+E7Ph3flM3L81NgHNcmW/rYDNbSad6DtKZXKQJgKZ8UA+gFY0zbqEbEXsoVegJE3EmJlQFBB6Nm+B0RmKVrlqg5A1nNZqWq5fAmUWargBkc8bivSkvnFbdis7G6WWvWVvEnbKtVIzrOeaqlnFuOgzNSDWkJrNZqPyg8jvSrVx8nuO4OWMaUy/IbpGvbNrdXnk8Vv5JspJKcJu3ZXud5yqAzWWgmBD6I+3l5kbECYIVpKuORhqcv/dwuyXkhwRncd82lCMkShLNJF7piuDvfQLPlL7ycDyyWjsgjg1FXtoUlp5n3sVEkYLndntcdh8mfhtL+xIw/Dx62QGa7ZFaU8mP5UMUB5iESXjgZk3A=
-  file: uptown-style.zip
+    secure: do1Jd8PD6IsIp2cxjO2R9VSTQEl4EkGPunObPnNaJ64cwi/g/6O/cAMyYrFyx0fi+WnHILSu/jLjUdvHcnH/WyIfbL1hdKk1ux7h0LgNjbDjp2UxkhwCQF4eR+9Q64WNxy1THDRrQc9tUaM8rQI1PTN85W34ZB2MOp9e2ClpGw1FzNrRCwr7wI2nprY5vrH7wSj/YNZsdvJ3fQ+BNUFLJkDuWpilqGgy9JwYHZDZu1xCcWbsVeaojGISLHZR5JaiD5fzFy5kH9cgvW6CnsmuaNWzS3agWpTQA+1qyWQmBPWPd4JV0j+NOx+pgORE3N2snjflgoqG7fsLIovq0AAChj5AqBmomN42J/xsTyGJn3qG9QasdkHsBfIIYfc45jhZ5QAwCxGCEdrRqNMEfLSrqYp1N0N0QReCAbeNl0CW4o2jDiPbZ+9dOCpBSHUDnmsZ85KohUmx5LYJV6i0k3JsLuzB55t0oBsyIEaDcdjmeqXMA1J/bQH3G9mhn5SBWWO7ND6xHsCnOkPrnQJCtS5VJG1XjazqwSvXROfc3PvLJnQ/R2Oq/iehBGb/Oa/H9AfhlOrESuWDi/Hq35sHDbOBnuXAHa7kurLw6I2COxT5nD412NTfOWYKZ/0jQyctTYX3rard8PE6Xr4zHuhmLZKjpkTmJfdXTd4L8bM9XlZSjrc=
+  file:
+    - "$TRAVIS_BUILD_DIR/$WP_THEME.zip"
+    - "$TRAVIS_BUILD_DIR/$WP_THEME.zip.sha256"
+  skip_cleanup: true
+  overwrite: true
   on:
     tags: true
     repo: godaddy/wp-uptown-style-theme
-  skip_cleanup: true
-  overwrite: true

Gruntfile.js

@@ -2,9 +2,11 @@
 
 module.exports = function( grunt ) {
 
+	'use strict';
+
 	var pkg = grunt.file.readJSON( 'package.json' );
 
-	grunt.initConfig({
+	grunt.initConfig( {
 
 		pkg: pkg,
 
@@ -21,11 +23,38 @@ module.exports = function( grunt ) {
 				],
 				cascade: false
 			},
-			dist: {
-				src: [ '*.css' ]
+			editor: {
+				src: [ 'editor-style.css' ]
+			},
+			main: {
+				src: [ 'style.css' ]
 			}
 		},
 
+		clean: {
+			options: {
+				force: true
+			},
+			build: [ 'build/' ]
+		},
+
+		copy: {
+			build: {
+				expand: true,
+				cwd: '.',
+				src: [
+					'*.css',
+					'*.php',
+					'*.txt',
+					'screenshot.png',
+					'assets/**',
+					'inc/**',
+					'templates/**'
+				],
+				dest: 'build/'
+			},
+		},
+
 		cssjanus: {
 			theme: {
 				options: {
@@ -44,68 +73,119 @@ module.exports = function( grunt ) {
 			}
 		},
 
-		sass: {
+		devUpdate: {
+			packages: {
+				options: {
+					updateType: 'force'
+				}
+			}
+		},
+
+		imagemin: {
 			options: {
-				precision: 5,
-				sourceMap: false
+				optimizationLevel: 3
 			},
-			dist: {
-				files: [
-					{
-						'style.css': '.dev/sass/style.scss',
-						'editor-style.css': '.dev/sass/editor-style.scss'
-					}
-				]
+			assets: {
+				expand: true,
+				cwd: 'assets/images/',
+				src: [ '**/*.{gif,jpeg,jpg,png,svg}' ],
+				dest: 'assets/images/'
+			},
+			screenshot: {
+				files: {
+					'screenshot.png': 'screenshot.png'
+				}
 			}
 		},
 
-		watch: {
-			css: {
-				files: '.dev/sass/**/*.scss',
-				tasks: [ 'sass','autoprefixer','cssjanus' ]
-			}
+		jshint: {
+			gruntfile: [ 'Gruntfile.js' ]
 		},
 
 		replace: {
-			version_php: {
-				src: [
-					'**/*.php',
-					'.dev/**/*.scss',
-					'**/*.css'
+			charset: {
+				overwrite: true,
+				replacements: [
+					{
+						from: /^@charset "UTF-8";\n/,
+						to: ''
+					}
 				],
+				src: [ 'style*.css' ]
+			},
+			php: {
 				overwrite: true,
-				replacements: [ {
-					from: /Version:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
-					to: 'Version:$1' + pkg.version
-				}, {
-					from: /@version(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
-					to: '@version$1' + pkg.version
-				}, {
-					from: /@since(.*?)NEXT/mg,
-					to: '@since$1' + pkg.version
-				}, {
-					from: /VERSION(\s*?)=(\s*?['"])[a-zA-Z0-9\.\-\+]+/mg,
-					to: 'VERSION$1=$2' + pkg.version
-				}, {
-					from: /'PRIMER_CHILD_VERSION', '[a-zA-Z0-9\.\-\+]+'/mg,
-					to: '\'PRIMER_CHILD_VERSION\', \'' + pkg.version + '\''
-				}]
+				replacements: [
+					{
+						from: /Version:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
+						to: 'Version:$1' + pkg.version
+					},
+					{
+						from: /@since(.*?)NEXT/mg,
+						to: '@since$1' + pkg.version
+					},
+					{
+						from: /@NEXT/g,
+						to: '<%= pkg.version %>'
+					},
+					{
+						from: /VERSION(\s*?)=(\s*?['"])[a-zA-Z0-9\.\-\+]+/mg,
+						to: 'VERSION$1=$2' + pkg.version
+					},
+					{
+						from: /'PRIMER_CHILD_VERSION', '[a-zA-Z0-9\.\-\+]+'/mg,
+						to: '\'PRIMER_CHILD_VERSION\', \'' + pkg.version + '\''
+					}
+				],
+				src: [ '*.php', 'inc/**/*.php', 'templates/**/*.php' ]
 			},
-			version_readme: {
-				src: 'readme.*',
+			readme: {
 				overwrite: true,
-				replacements: [ {
-					from: /^(\*\*|)Stable tag:(\*\*|)(\s*?)[a-zA-Z0-9.-]+(\s*?)$/mi,
-					to: '$1Stable tag:$2$3<%= pkg.version %>$4'
-				} ]
+				replacements: [
+					{
+						from: /Stable tag:(\s*)[\w.+-]+/,
+						to: 'Stable tag:$1<%= pkg.version %>'
+					}
+				],
+				src: [ 'readme.txt' ]
 			},
-			pot:{
-				src: 'languages/' + pkg.name + '.pot',
+			sass: {
 				overwrite: true,
-				replacements: [ {
-					from: 'charset=CHARSET',
-					to: 'charset=UTF-8'
-				} ]
+				replacements: [
+					{
+						from: /Version:(\s*)[\w.+-]+/,
+						to: 'Version:$1<%= pkg.version %>'
+					}
+				],
+				src: [ '.dev/sass/**/*.scss' ]
+			}
+		},
+
+		sass: {
+			options: {
+				precision: 5,
+				sourceMap: false
+			},
+			editor: {
+				files: {
+					'editor-style.css': '.dev/sass/editor-style.scss'
+				}
+			},
+			main: {
+				files: {
+					'style.css': '.dev/sass/style.scss'
+				}
+			}
+		},
+
+		watch: {
+			images: {
+				files: 'assets/images/**/*.{gif,jpeg,jpg,png,svg}',
+				tasks: [ 'imagemin' ]
+			},
+			sass: {
+				files: '.dev/sass/**/*.scss',
+				tasks: [ 'sass', 'replace:charset', 'autoprefixer', 'cssjanus' ]
 			}
 		},
 
@@ -139,12 +219,14 @@ module.exports = function( grunt ) {
 			}
 		}
 
-	});
+	} );
 
 	require( 'matchdep' ).filterDev( 'grunt-*' ).forEach( grunt.loadNpmTasks );
 
-	grunt.registerTask( 'default', [ 'sass', 'autoprefixer', 'cssjanus' ] );
+	grunt.registerTask( 'default', [ 'sass', 'replace:charset', 'autoprefixer', 'cssjanus', 'jshint', 'imagemin' ] );
+	grunt.registerTask( 'build',   [ 'default', 'clean', 'copy' ] );
+	grunt.registerTask( 'check',   [ 'devUpdate' ] );
 	grunt.registerTask( 'readme',  [ 'wp_readme_to_markdown' ] );
-	grunt.registerTask( 'version', [ 'replace' ] );
+	grunt.registerTask( 'version', [ 'replace', 'readme', 'build' ] );
 
 };