From 6671d9cd14eec1eb05e53486c284b8f1cd635d15 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Thu, 13 Oct 2016 18:00:44 -0400 Subject: [PATCH 1/3] Remove bottom margin on the side masthead. --- .dev/sass/partials/_menus.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/.dev/sass/partials/_menus.scss b/.dev/sass/partials/_menus.scss index fe8352f..27adf15 100644 --- a/.dev/sass/partials/_menus.scss +++ b/.dev/sass/partials/_menus.scss @@ -327,7 +327,6 @@ body { z-index: 9999; background-color: $menu-bg-ie; background-color: $menu-background-color; - margin-bottom: 60px; @media #{$medium-up}{ position: fixed; From b621308ec91e6ee92d16fb626469b83a0696ec27 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Wed, 19 Oct 2016 15:33:56 -0400 Subject: [PATCH 2/3] Update .hero text widget p font size. --- .dev/sass/partials/_widgets.scss | 5 +++++ style-rtl.css | 7 +++++-- style.css | 7 +++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.dev/sass/partials/_widgets.scss b/.dev/sass/partials/_widgets.scss index bc7696e..686b29d 100644 --- a/.dev/sass/partials/_widgets.scss +++ b/.dev/sass/partials/_widgets.scss @@ -242,3 +242,8 @@ $widget-bg: #fff !default; } } } + +.hero .widget.widget_text p { + font-size: 1.4rem; + line-height: 1.4; +} diff --git a/style-rtl.css b/style-rtl.css index 28fe019..0ca1e0a 100644 --- a/style-rtl.css +++ b/style-rtl.css @@ -3038,8 +3038,7 @@ a { text-align: center; z-index: 9999; background-color: #191919; - background-color: rgba(25, 25, 25, 0.95); - margin-bottom: 60px; } + background-color: rgba(25, 25, 25, 0.95); } .side-masthead:before, .side-masthead:after { content: " "; display: table; } @@ -3369,6 +3368,10 @@ a { .widget_calendar #calendar_wrap #wp-calendar tfoot td#next { text-align: left; } +.hero .widget.widget_text p { + font-size: 1.4rem; + line-height: 1.4; } + html { -webkit-font-smoothing: antialiased; } diff --git a/style.css b/style.css index 89844dc..56a0ea0 100644 --- a/style.css +++ b/style.css @@ -3038,8 +3038,7 @@ a { text-align: center; z-index: 9999; background-color: #191919; - background-color: rgba(25, 25, 25, 0.95); - margin-bottom: 60px; } + background-color: rgba(25, 25, 25, 0.95); } .side-masthead:before, .side-masthead:after { content: " "; display: table; } @@ -3369,6 +3368,10 @@ a { .widget_calendar #calendar_wrap #wp-calendar tfoot td#next { text-align: right; } +.hero .widget.widget_text p { + font-size: 1.4rem; + line-height: 1.4; } + html { -webkit-font-smoothing: antialiased; } From 34183148242a6194db46284f2ddf607b1034eb89 Mon Sep 17 00:00:00 2001 From: Jonathan Bardo Date: Thu, 13 Oct 2016 12:00:04 -0400 Subject: [PATCH 3/3] Add setup for automatic releases --- .distignore | 8 ++++++++ .travis.yml | 29 +++++++++++++++++++++++++++++ Gruntfile.js | 43 +++++++++++++++++++++++++++++++++++++++++++ package.json | 8 +++++--- 4 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 .distignore create mode 100644 .travis.yml diff --git a/.distignore b/.distignore new file mode 100644 index 0000000..4cf3501 --- /dev/null +++ b/.distignore @@ -0,0 +1,8 @@ +.distignore +.git +.gitignore +.travis.yml +.dev +package.json +node_modules +Gruntfile.js diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..112cda6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,29 @@ +sudo: false + +language: + - php + - node_js + +before_script: + - curl -s https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli-nightly.phar > /tmp/wp-cli.phar + +script: + - echo "Deploy only" + +before_deploy: + - export RELEASE_FOLDER=escapade + - 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 + +deploy: + provider: releases + api_key: + secure: Gw/QxCTvWCReWaGnDw98OqFI8WajPSre8CGSERE8gWZnCiOKINKqCzwAEn6Obte6zaRoZN3iJnNHiT/dMCPmb00+qoJTIoTHRucQ7DgVKs/klNZ7lIeO8hj0pq6iMMhuaXhtGddxuYZRD9rGSUY1L+r67kYugEfPzmWwvIJ9G+rM0jsj3JH/QgR/qBH0JnZ+VC6wynduZvnDK+C6PVkz04JYav9LlZQAo8XvclaUCBSepoM4SLpnouPMgRtzzfZZlNxom8iqslFn9ovYfHfrQDhhFow7wBbdPxJf2zhwuo8FxYJfHmrOgQH1YajEwIJwNSNpur6swMKI8e2MjEds2Y/RfpViiyQrx82L8EkMGGMRRZECeOeOeGW61TB7m+B4jmY/4hTl/MglDG6o5NRo3tyR5hybGAe2BhPYvnWkO8CukLSfXFQjs+JCNUfUp1HlCAujF2IL859ywUCplgx4rFB4mbN0WI7t3LCEPn85rp1oHo5AFLWwDSGHXfSlbDkiR5C81XFjfbM+T0O8eR3IA/hvpQBeKjCYjQrS33LtTMza6xrGenwENXgQpMB/Lxiiw45HLdcHDDuzaQU8JbU9x49k4tH457xdl40OjL1tharSItq20ESOZuYSM7n61d43vfP/zrbPKTNrIiOJOm7zeY3NXuik+Q7Mcr0M81aGcfQ= + file: escapade.zip + on: + tags: true + repo: godaddy/wp-escapade-theme + skip_cleanup: true + overwrite: true diff --git a/Gruntfile.js b/Gruntfile.js index 42bf57c..9758059 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -64,6 +64,48 @@ module.exports = function( grunt ) { files: '.dev/sass/**/*.scss', tasks: [ 'sass','autoprefixer','cssjanus' ] } + }, + + replace: { + version_php: { + src: [ + '**/*.php', + '.dev/**/*.scss' + ], + 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 + '\'' + }] + }, + version_readme: { + src: 'readme.*', + overwrite: true, + replacements: [ { + from: /^(\*\*|)Stable tag:(\*\*|)(\s*?)[a-zA-Z0-9.-]+(\s*?)$/mi, + to: '$1Stable tag:$2$3<%= pkg.version %>$4' + } ] + }, + pot:{ + src: 'languages/' + pkg.name + '.pot', + overwrite: true, + replacements: [ { + from: 'charset=CHARSET', + to: 'charset=UTF-8' + } ] + } } }); @@ -71,5 +113,6 @@ module.exports = function( grunt ) { require( 'matchdep' ).filterDev( 'grunt-*' ).forEach( grunt.loadNpmTasks ); grunt.registerTask( 'default', [ 'sass', 'autoprefixer', 'cssjanus' ] ); + grunt.registerTask( 'version', [ 'replace' ] ); }; diff --git a/package.json b/package.json index fbb9c39..d9bbd14 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,6 @@ "bugs": { "url": "https://github.com/godaddy/wp-escapade-theme/issues" }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, "devDependencies": { "grunt": "~0.4.5", "grunt-autoprefixer": "~3.0.4", @@ -20,7 +17,12 @@ "grunt-cssjanus": "~0.3.2", "grunt-dev-update": "~2.0.0", "grunt-sass": "^1.2.0", + "grunt-text-replace": "^0.4.0", "load-grunt-tasks": "~3.5.0", "matchdep": "~1.0.1" + }, + "scripts": { + "version": "grunt version && grunt && git add -A .", + "postversion": "git push && git push --tags" } }