From 0287a0b13443da63d02c1a8f2d795935570a5309 Mon Sep 17 00:00:00 2001 From: Dave Kiss Date: Sat, 1 Apr 2017 19:08:11 -0700 Subject: [PATCH 01/19] Add Tachyons as a CSS framework option --- src/lib/Sage/PostCreateProject.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/lib/Sage/PostCreateProject.php b/src/lib/Sage/PostCreateProject.php index d7583cbd9e..4a7af5c23b 100755 --- a/src/lib/Sage/PostCreateProject.php +++ b/src/lib/Sage/PostCreateProject.php @@ -52,6 +52,7 @@ public static function selectFramework(Event $event) $frameworks = [ 'Bootstrap', 'Foundation', + 'Tachyons', 'None' ]; $framework = $io->select('Select a CSS framework (Default: Bootstrap)', $frameworks, 0); @@ -68,6 +69,14 @@ public static function selectFramework(Event $event) } break; case 2: + file_put_contents('package.json', preg_replace("/{$default_framework_pattern}/", '"tachyons": "^4.6.2"', file_get_contents('package.json'))); + file_put_contents('assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~tachyons/src/tachyons";' . "\n", file_get_contents('assets/styles/main.scss'))); + file_put_contents('assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('assets/scripts/main.js'))); + foreach($files_to_clear as $file) { + file_put_contents($file, ''); + } + break; + case 3: file_put_contents('package.json', preg_replace("/\s+{$default_framework_pattern},/", '', file_get_contents('package.json'))); file_put_contents('assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '', file_get_contents('assets/styles/main.scss'))); file_put_contents('assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('assets/scripts/main.js'))); From b1ad725408fe40a404cbbc7ec4d9cb5d0a0c9fed Mon Sep 17 00:00:00 2001 From: Dave Kiss Date: Sat, 1 Apr 2017 19:11:26 -0700 Subject: [PATCH 02/19] Add Tachyons as CSS framework option --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e3e3c96edd..0b2d2ee299 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Sage is a WordPress starter theme with a modern development workflow. * CSS framework options: * [Bootstrap 4](http://getbootstrap.com/) * [Foundation](http://foundation.zurb.com/) + * [Tachyons](http://tachyons.io/) * None (blank slate) * Font Awesome (optional) @@ -45,7 +46,7 @@ $ composer create-project roots/sage your-theme-name dev-master During theme installation you will have the options to: * Update theme headers (theme name, description, author, etc.) -* Select a CSS framework (Bootstrap, Foundation, none) +* Select a CSS framework (Bootstrap, Foundation, Tachyons, none) * Add Font Awesome * Configure Browsersync (path to theme, local development URL) From aef74daa124fc748f0e0be1c3071c5b2fa12e1a4 Mon Sep 17 00:00:00 2001 From: Dave Kiss Date: Sat, 1 Apr 2017 19:12:35 -0700 Subject: [PATCH 03/19] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e67af4e08..7ee1e5d672 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ### HEAD * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822)) * Add support for HTML injection ([#1817](https://github.com/roots/sage/pull/1817)) +* Add Tachyons as a CSS framework option ### 9.0.0-beta.2: January 19th, 2016 * Fix Browersync ([#1815](https://github.com/roots/sage/pull/1815)) From b1859ccb27bc4506e9c7e2c101fecd678ebebf06 Mon Sep 17 00:00:00 2001 From: Dave Kiss Date: Sat, 1 Apr 2017 19:21:07 -0700 Subject: [PATCH 04/19] Add Tachyons PR link --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ee1e5d672..274e09f6b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ### HEAD * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822)) * Add support for HTML injection ([#1817](https://github.com/roots/sage/pull/1817)) -* Add Tachyons as a CSS framework option +* Add Tachyons as a CSS framework option ([#1867](https://github.com/roots/sage/pull/1867)) ### 9.0.0-beta.2: January 19th, 2016 * Fix Browersync ([#1815](https://github.com/roots/sage/pull/1815)) From cd8f3069792dd01caeeb9317f57735736b6dfdd3 Mon Sep 17 00:00:00 2001 From: Dave Kiss Date: Sat, 1 Apr 2017 19:52:16 -0700 Subject: [PATCH 05/19] Use official SASS transpiled partials instead Sage works better without assuming PostCSS is part of the build process. Previously included version implements PostCSS. See: github.com/tachyons-css/tachyons-sass --- src/lib/Sage/PostCreateProject.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Sage/PostCreateProject.php b/src/lib/Sage/PostCreateProject.php index 4a7af5c23b..70fcf2aa6c 100755 --- a/src/lib/Sage/PostCreateProject.php +++ b/src/lib/Sage/PostCreateProject.php @@ -69,8 +69,8 @@ public static function selectFramework(Event $event) } break; case 2: - file_put_contents('package.json', preg_replace("/{$default_framework_pattern}/", '"tachyons": "^4.6.2"', file_get_contents('package.json'))); - file_put_contents('assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~tachyons/src/tachyons";' . "\n", file_get_contents('assets/styles/main.scss'))); + file_put_contents('package.json', preg_replace("/{$default_framework_pattern}/", '"tachyons-sass": "^4.7.1"', file_get_contents('package.json'))); + file_put_contents('assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~tachyons-sass/tachyons";' . "\n", file_get_contents('assets/styles/main.scss'))); file_put_contents('assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('assets/scripts/main.js'))); foreach($files_to_clear as $file) { file_put_contents($file, ''); From 17e7d7637704ac86697a7c13fc5eaef31e5f0a78 Mon Sep 17 00:00:00 2001 From: Sam Rapaport Date: Mon, 24 Apr 2017 11:38:43 -0700 Subject: [PATCH 06/19] Add Stylelint linting for scss files. --- .stylelintrc | 3 + package.json | 3 + resources/assets/build/webpack.config.js | 5 + yarn.lock | 405 +++++++++++++++++++++-- 4 files changed, 393 insertions(+), 23 deletions(-) create mode 100644 .stylelintrc diff --git a/.stylelintrc b/.stylelintrc new file mode 100644 index 0000000000..40db42c668 --- /dev/null +++ b/.stylelintrc @@ -0,0 +1,3 @@ +{ + "extends": "stylelint-config-standard" +} diff --git a/package.json b/package.json index 75c16ded57..1efe4e0858 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,9 @@ "rimraf": "^2.6.1", "sass-loader": "^6.0.3", "style-loader": "^0.16.0", + "stylelint": "^7.10.1", + "stylelint-config-standard": "^16.0.0", + "stylelint-webpack-plugin": "^0.5.1", "url-loader": "^0.5.8", "webpack": "^2.4.1", "webpack-assets-manifest": "^0.6.2", diff --git a/resources/assets/build/webpack.config.js b/resources/assets/build/webpack.config.js index cdd44b275a..10c271ee13 100644 --- a/resources/assets/build/webpack.config.js +++ b/resources/assets/build/webpack.config.js @@ -5,6 +5,7 @@ const merge = require('webpack-merge'); const autoprefixer = require('autoprefixer'); const CleanPlugin = require('clean-webpack-plugin'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); +const StyleLintPlugin = require('stylelint-webpack-plugin'); const CopyGlobsPlugin = require('copy-globs-webpack-plugin'); const config = require('./config'); @@ -151,6 +152,10 @@ let webpackConfig = { eslint: { failOnWarning: false, failOnError: true }, }, }), + new StyleLintPlugin({ + failOnError: ! config.enabled.watcher, + syntax: 'scss', + }), ], }; diff --git a/yarn.lock b/yarn.lock index b19051b7b4..d5b65c2ef5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +JSONStream@^0.8.4: + version "0.8.4" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd" + dependencies: + jsonparse "0.0.5" + through ">=2.2.7 <3" + abbrev@1: version "1.1.0" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f" @@ -178,7 +185,7 @@ arraybuffer.slice@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca" -arrify@^1.0.0: +arrify@^1.0.0, arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -246,7 +253,7 @@ atob@~1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773" -autoprefixer@^6.3.1, autoprefixer@^6.7.7: +autoprefixer@^6.0.0, autoprefixer@^6.3.1, autoprefixer@^6.7.7: version "6.7.7" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" dependencies: @@ -284,7 +291,7 @@ backo2@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" -balanced-match@^0.4.1, balanced-match@^0.4.2: +balanced-match@^0.4.0, balanced-match@^0.4.1, balanced-match@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" @@ -528,7 +535,7 @@ browserify-zlib@^0.1.4: dependencies: pako "~0.2.0" -browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: +browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: version "1.7.7" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" dependencies: @@ -680,7 +687,7 @@ caniuse-api@^1.5.2: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: +caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000655" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000655.tgz#e40b6287adc938848d6708ef83d65b5f54ac1874" @@ -795,6 +802,13 @@ clone-deep@^0.2.4: lazy-cache "^1.0.3" shallow-clone "^0.1.2" +clone-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c" + dependencies: + is-regexp "^1.0.0" + is-supported-regexp-flag "^1.0.0" + clone-stats@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" @@ -831,6 +845,10 @@ color-convert@^1.3.0: dependencies: color-name "^1.1.1" +color-diff@^0.1.3: + version "0.1.7" + resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2" + color-name@^1.0.0, color-name@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d" @@ -849,6 +867,21 @@ color@^0.11.0: color-convert "^1.3.0" color-string "^0.3.0" +colorguard@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.0.tgz#f3facaf5caaeba4ef54653d9fb25bb73177c0d84" + dependencies: + chalk "^1.1.1" + color-diff "^0.1.3" + log-symbols "^1.0.2" + object-assign "^4.0.1" + pipetteur "^2.0.0" + plur "^2.0.0" + postcss "^5.0.4" + postcss-reporter "^1.2.1" + text-table "^0.2.0" + yargs "^1.2.6" + colormin@^1.0.5: version "1.1.2" resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133" @@ -1057,6 +1090,10 @@ crypto-browserify@^3.11.0: public-encrypt "^4.0.0" randombytes "^2.0.0" +css-color-names@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6" + css-color-names@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" @@ -1078,6 +1115,15 @@ css-loader@^0.28.0: postcss-modules-values "^1.1.0" source-list-map "^0.1.7" +css-rule-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2" + dependencies: + css-tokenize "^1.0.1" + duplexer2 "0.0.2" + ldjson-stream "^1.2.1" + through2 "^0.6.3" + css-selector-tokenizer@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152" @@ -1094,6 +1140,13 @@ css-selector-tokenizer@^0.7.0: fastparse "^1.1.1" regexpu-core "^1.0.0" +css-tokenize@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be" + dependencies: + inherits "^2.0.1" + readable-stream "^1.0.33" + css@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/css/-/css-2.2.1.tgz#73a4c81de85db664d4ee674f7d47085e3b2d55dc" @@ -1199,7 +1252,7 @@ debug@2.3.3: dependencies: ms "0.7.2" -debug@^2.1.1, debug@^2.1.3, debug@^2.2.0: +debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.0: version "2.6.3" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d" dependencies: @@ -1342,6 +1395,23 @@ doctrine@^2.0.0: esutils "^2.0.2" isarray "^1.0.0" +doiuse@^2.4.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834" + dependencies: + browserslist "^1.1.1" + caniuse-db "^1.0.30000187" + css-rule-stream "^1.1.0" + duplexer2 "0.0.2" + jsonfilter "^1.1.2" + ldjson-stream "^1.2.1" + lodash "^4.0.0" + multimatch "^2.0.0" + postcss "^5.0.8" + source-map "^0.4.2" + through2 "^0.6.3" + yargs "^3.5.4" + dom-compare-temp@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/dom-compare-temp/-/dom-compare-temp-0.1.0.tgz#d540969876741a83a447fe7dc8b28d8a5b95339a" @@ -1414,6 +1484,10 @@ duplexer2@^0.1.4, duplexer2@~0.1.0: dependencies: readable-stream "^2.0.2" +duplexer@~0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" + duplexify@^3.2.0: version "3.5.0" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.0.tgz#1aa773002e1578457e9d9d4a50b0ccaaebcbd604" @@ -1819,6 +1893,12 @@ execa@^0.5.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execall@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73" + dependencies: + clone-regexp "^1.0.0" + executable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/executable/-/executable-1.1.0.tgz#877980e9112f3391066da37265de7ad8434ab4d9" @@ -2075,6 +2155,10 @@ function-bind@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" +gather-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b" + gauge@~2.7.1: version "2.7.3" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09" @@ -2118,6 +2202,10 @@ get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" +get-stdin@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" + get-stream@^2.2.0: version "2.3.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" @@ -2208,6 +2296,20 @@ globby@^5.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" +globby@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" + dependencies: + array-union "^1.0.1" + glob "^7.0.3" + object-assign "^4.0.1" + pify "^2.0.0" + pinkie-promise "^2.0.0" + +globjoin@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" + globule@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/globule/-/globule-1.1.0.tgz#c49352e4dc183d85893ee825385eb994bb6df45f" @@ -2403,6 +2505,10 @@ html-entities@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz#41948caf85ce82fed36e4e6a0ed371a6664379e2" +html-tags@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-1.1.1.tgz#869f43859f12d9bdc3892419e494a628aa1b204e" + "htmlparser2@>= 3.7.3 < 4.0.0": version "3.9.2" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338" @@ -2602,6 +2708,10 @@ ip-regex@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd" +irregular-plurals@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac" + is-absolute-url@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" @@ -2774,6 +2884,10 @@ is-redirect@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + is-relative@^0.1.0: version "0.1.3" resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82" @@ -2792,6 +2906,10 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" +is-supported-regexp-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz#8b520c85fae7a253382d4b02652e045576e13bb8" + is-svg@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9" @@ -2949,10 +3067,23 @@ jsonfile@^2.1.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfilter@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11" + dependencies: + JSONStream "^0.8.4" + minimist "^1.1.0" + stream-combiner "^0.2.1" + through2 "^0.6.3" + jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" +jsonparse@0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64" + jsonpointer@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" @@ -2984,6 +3115,10 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" +known-css-properties@^0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.0.7.tgz#9104343a2adfd8ef3b07bdee7a325e4d44ed9371" + lazy-cache@^0.2.3: version "0.2.7" resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" @@ -3008,6 +3143,13 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" +ldjson-stream@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b" + dependencies: + split2 "^0.2.1" + through2 "^0.6.1" + levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -3255,7 +3397,7 @@ lodash@^3.10.1: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0: +lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -3263,6 +3405,12 @@ lodash@~4.16.4: version "4.16.6" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.6.tgz#d22c9ac660288f3843e16ba7d2b5d06cca27d777" +log-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" + dependencies: + chalk "^1.0.0" + logalot@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552" @@ -3351,7 +3499,7 @@ merge-stream@^1.0.0: dependencies: readable-stream "^2.0.1" -micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.7: +micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7: version "2.3.11" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" dependencies: @@ -3449,6 +3597,15 @@ ms@0.7.2: version "0.7.2" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765" +multimatch@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b" + dependencies: + array-differ "^1.0.0" + array-union "^1.0.1" + arrify "^1.0.0" + minimatch "^3.0.0" + multipipe@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" @@ -3594,6 +3751,10 @@ normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" +normalize-selector@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03" + normalize-url@^1.4.0: version "1.9.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" @@ -3687,6 +3848,10 @@ once@~1.3.0: dependencies: wrappy "1" +onecolor@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.4.tgz#75a46f80da6c7aaa5b4daae17a47198bd9652494" + onetime@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" @@ -3894,6 +4059,13 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" +pipetteur@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f" + dependencies: + onecolor "^3.0.4" + synesthesia "^1.0.1" + pkg-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" @@ -3906,6 +4078,12 @@ pkg-up@^1.0.0: dependencies: find-up "^1.0.0" +plur@^2.0.0, plur@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a" + dependencies: + irregular-plurals "^1.0.0" + pluralize@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" @@ -3986,6 +4164,12 @@ postcss-filter-plugins@^2.0.0: postcss "^5.0.4" uniqid "^4.0.0" +postcss-less@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324" + dependencies: + postcss "^5.0.21" + postcss-load-config@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a" @@ -4018,6 +4202,10 @@ postcss-loader@^1.3.3: postcss "^5.2.15" postcss-load-config "^1.2.0" +postcss-media-query-parser@^0.2.0: + version "0.2.3" + resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" + postcss-merge-idents@^2.1.5: version "2.1.7" resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270" @@ -4149,7 +4337,35 @@ postcss-reduce-transforms@^1.0.3: postcss "^5.0.8" postcss-value-parser "^3.0.1" -postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: +postcss-reporter@^1.2.1, postcss-reporter@^1.3.3: + version "1.4.1" + resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2" + dependencies: + chalk "^1.0.0" + lodash "^4.1.0" + log-symbols "^1.0.2" + postcss "^5.0.0" + +postcss-reporter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f" + dependencies: + chalk "^1.0.0" + lodash "^4.1.0" + log-symbols "^1.0.2" + postcss "^5.0.0" + +postcss-resolve-nested-selector@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" + +postcss-scss@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c" + dependencies: + postcss "^5.2.13" + +postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1, postcss-selector-parser@^2.2.2: version "2.2.3" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90" dependencies: @@ -4186,7 +4402,7 @@ postcss-zindex@^2.0.1: postcss "^5.0.4" uniqs "^2.0.0" -postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.15, postcss@^5.2.16: +postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.15, postcss@^5.2.16, postcss@^5.2.4: version "5.2.17" resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b" dependencies: @@ -4315,6 +4531,12 @@ read-all-stream@^3.0.0: pinkie-promise "^2.0.0" readable-stream "^2.0.0" +read-file-stdin@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61" + dependencies: + gather-stream "^1.0.0" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -4339,6 +4561,15 @@ read-pkg@^1.0.0: isarray "0.0.1" string_decoder "~0.10.x" +readable-stream@^1.0.33, readable-stream@~1.1.9: + version "1.1.14" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6: version "2.2.9" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8" @@ -4351,15 +4582,6 @@ readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2. string_decoder "~1.0.0" util-deprecate "~1.0.1" -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readdirp@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" @@ -4542,6 +4764,10 @@ resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" +resolve-from@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57" + resolve-url-loader@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.0.2.tgz#c465e97ea0a4791f3961f766cea775ff2e3ceb8c" @@ -4850,6 +5076,12 @@ source-map@^0.1.38: dependencies: amdefine ">=0.0.4" +source-map@^0.4.2: + version "0.4.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" + dependencies: + amdefine ">=0.0.4" + source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3: version "0.5.6" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" @@ -4878,6 +5110,16 @@ spdx-license-ids@^1.0.2: version "1.2.2" resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" +specificity@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.0.tgz#332472d4e5eb5af20821171933998a6bc3b1ce6f" + +split2@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900" + dependencies: + through2 "~0.6.1" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -4933,6 +5175,13 @@ stream-combiner2@^1.1.1: duplexer2 "~0.1.0" readable-stream "^2.0.2" +stream-combiner@^0.2.1: + version "0.2.2" + resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" + dependencies: + duplexer "~0.1.1" + through "~2.3.4" + stream-http@^2.3.1: version "2.7.0" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6" @@ -5047,6 +5296,87 @@ style-loader@^0.16.0: dependencies: loader-utils "^1.0.2" +style-search@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" + +stylehacks@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b" + dependencies: + browserslist "^1.1.3" + chalk "^1.1.1" + log-symbols "^1.0.2" + minimist "^1.2.0" + plur "^2.1.2" + postcss "^5.0.18" + postcss-reporter "^1.3.3" + postcss-selector-parser "^2.0.0" + read-file-stdin "^0.2.1" + text-table "^0.2.0" + write-file-stdout "0.0.2" + +stylelint-config-standard@^16.0.0: + version "16.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-16.0.0.tgz#bb7387bff1d7dd7186a52b3ebf885b2405d691bf" + +stylelint-webpack-plugin@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/stylelint-webpack-plugin/-/stylelint-webpack-plugin-0.5.1.tgz#c07a92d9acbdc653a67b66aa3aa4fedde0bfcc9d" + dependencies: + arrify "^1.0.1" + chalk "^1.1.3" + object-assign "^4.1.0" + stylelint "^7.7.0" + +stylelint@^7.10.1, stylelint@^7.7.0: + version "7.10.1" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.10.1.tgz#209a7ce5e781fc2a62489fbb31ec0201ec675db2" + dependencies: + autoprefixer "^6.0.0" + balanced-match "^0.4.0" + chalk "^1.1.1" + colorguard "^1.2.0" + cosmiconfig "^2.1.1" + debug "^2.6.0" + doiuse "^2.4.1" + execall "^1.0.0" + file-entry-cache "^2.0.0" + get-stdin "^5.0.0" + globby "^6.0.0" + globjoin "^0.1.4" + html-tags "^1.1.1" + ignore "^3.2.0" + imurmurhash "^0.1.4" + known-css-properties "^0.0.7" + lodash "^4.17.4" + log-symbols "^1.0.2" + meow "^3.3.0" + micromatch "^2.3.11" + normalize-selector "^0.2.0" + postcss "^5.0.20" + postcss-less "^0.14.0" + postcss-media-query-parser "^0.2.0" + postcss-reporter "^3.0.0" + postcss-resolve-nested-selector "^0.1.1" + postcss-scss "^0.4.0" + postcss-selector-parser "^2.1.1" + postcss-value-parser "^3.1.1" + resolve-from "^2.0.0" + specificity "^0.3.0" + string-width "^2.0.0" + style-search "^0.1.0" + stylehacks "^2.3.2" + sugarss "^0.2.0" + svg-tags "^1.0.0" + table "^4.0.1" + +sugarss@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e" + dependencies: + postcss "^5.2.4" + sum-up@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e" @@ -5063,6 +5393,10 @@ supports-color@^3.1.0, supports-color@^3.2.3: dependencies: has-flag "^1.0.0" +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + svgo@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" @@ -5079,6 +5413,12 @@ svgo@^0.7.0: version "3.2.2" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" +synesthesia@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777" + dependencies: + css-color-names "0.0.3" + table@^3.7.8: version "3.8.3" resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" @@ -5090,6 +5430,17 @@ table@^3.7.8: slice-ansi "0.0.4" string-width "^2.0.0" +table@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435" + dependencies: + ajv "^4.7.0" + ajv-keywords "^1.0.0" + chalk "^1.1.1" + lodash "^4.0.0" + slice-ansi "0.0.4" + string-width "^2.0.0" + tapable@^0.2.5, tapable@~0.2.5: version "0.2.6" resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d" @@ -5135,7 +5486,7 @@ tether@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a" -text-table@~0.2.0: +text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -5153,7 +5504,7 @@ through2-filter@^2.0.0: through2 "~2.0.0" xtend "~4.0.0" -through2@^0.6.0, through2@^0.6.1: +through2@^0.6.0, through2@^0.6.1, through2@^0.6.3, through2@~0.6.1: version "0.6.5" resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" dependencies: @@ -5167,7 +5518,7 @@ through2@^2.0.0, through2@~2.0.0: readable-stream "^2.1.5" xtend "~4.0.1" -through@^2.3.6: +"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -5615,6 +5966,10 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" +write-file-stdout@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1" + write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -5679,7 +6034,7 @@ yargs-parser@^5.0.0: dependencies: camelcase "^3.0.0" -yargs@3.29.0: +yargs@3.29.0, yargs@^3.5.4: version "3.29.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.29.0.tgz#1aab9660eae79d8b8f675bcaeeab6ee34c2cf69c" dependencies: @@ -5709,6 +6064,10 @@ yargs@6.4.0, yargs@^6.0.0: y18n "^3.2.1" yargs-parser "^4.1.0" +yargs@^1.2.6: + version "1.3.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a" + yargs@^4.7.1: version "4.8.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" From d81b85ec48470fa14fb60c3f2e355ae9fd5e9937 Mon Sep 17 00:00:00 2001 From: Sam Rapaport Date: Mon, 24 Apr 2017 11:42:59 -0700 Subject: [PATCH 07/19] Fix stylelint errors. --- resources/assets/styles/common/_global.scss | 3 +++ resources/assets/styles/components/_buttons.scss | 3 +++ resources/assets/styles/components/_comments.scss | 4 ++++ resources/assets/styles/components/_forms.scss | 6 +++++- resources/assets/styles/components/_wp-classes.scss | 6 ++++++ resources/assets/styles/layouts/_footer.scss | 3 +++ resources/assets/styles/layouts/_header.scss | 1 + resources/assets/styles/layouts/_pages.scss | 3 +++ resources/assets/styles/layouts/_posts.scss | 3 +++ resources/assets/styles/layouts/_sidebar.scss | 3 +++ resources/assets/styles/main.scss | 1 + 11 files changed, 35 insertions(+), 1 deletion(-) diff --git a/resources/assets/styles/common/_global.scss b/resources/assets/styles/common/_global.scss index e69de29bb2..657a224e06 100644 --- a/resources/assets/styles/common/_global.scss +++ b/resources/assets/styles/common/_global.scss @@ -0,0 +1,3 @@ +/* + | Global Theme Styles. + */ diff --git a/resources/assets/styles/components/_buttons.scss b/resources/assets/styles/components/_buttons.scss index e69de29bb2..0dbb070b3f 100644 --- a/resources/assets/styles/components/_buttons.scss +++ b/resources/assets/styles/components/_buttons.scss @@ -0,0 +1,3 @@ +/* + | Theme Button Styles. + */ diff --git a/resources/assets/styles/components/_comments.scss b/resources/assets/styles/components/_comments.scss index e007fe6065..baaff86f8b 100644 --- a/resources/assets/styles/components/_comments.scss +++ b/resources/assets/styles/components/_comments.scss @@ -1,18 +1,22 @@ .comment-list { @extend .list-unstyled; } + .comment-list ol { list-style: none; } + .comment-form p { @extend .form-group; } + .comment-form input[type="text"], .comment-form input[type="email"], .comment-form input[type="url"], .comment-form textarea { @extend .form-control; } + .comment-form input[type="submit"] { @extend .btn; @extend .btn-secondary; diff --git a/resources/assets/styles/components/_forms.scss b/resources/assets/styles/components/_forms.scss index 0d619bfd14..b2c7c6bfd6 100644 --- a/resources/assets/styles/components/_forms.scss +++ b/resources/assets/styles/components/_forms.scss @@ -2,13 +2,17 @@ .search-form { @extend .form-inline; } + .search-form label { - font-weight: normal; @extend .form-group; + + font-weight: normal; } + .search-form .search-field { @extend .form-control; } + .search-form .search-submit { @extend .btn; @extend .btn-secondary; diff --git a/resources/assets/styles/components/_wp-classes.scss b/resources/assets/styles/components/_wp-classes.scss index 19c943474d..8a250eb512 100644 --- a/resources/assets/styles/components/_wp-classes.scss +++ b/resources/assets/styles/components/_wp-classes.scss @@ -8,22 +8,26 @@ max-width: 100%; height: auto; } + .aligncenter { display: block; margin: ($spacer / 2) auto; height: auto; } + .alignleft, .alignright { margin-bottom: ($spacer / 2); height: auto; } + @include media-breakpoint-up(sm) { // Only float if not on an extra small device .alignleft { float: left; margin-right: ($spacer / 2); } + .alignright { float: right; margin-left: ($spacer / 2); @@ -34,10 +38,12 @@ .wp-caption { @extend .figure; } + .wp-caption img { @extend .figure-img; @extend .img-fluid; } + .wp-caption-text { @extend .figure-caption; } diff --git a/resources/assets/styles/layouts/_footer.scss b/resources/assets/styles/layouts/_footer.scss index e69de29bb2..5e1bb0670f 100644 --- a/resources/assets/styles/layouts/_footer.scss +++ b/resources/assets/styles/layouts/_footer.scss @@ -0,0 +1,3 @@ +/* + | Site Footer Styles. + */ diff --git a/resources/assets/styles/layouts/_header.scss b/resources/assets/styles/layouts/_header.scss index 2ad19563ea..fca4956829 100644 --- a/resources/assets/styles/layouts/_header.scss +++ b/resources/assets/styles/layouts/_header.scss @@ -1,6 +1,7 @@ .banner .nav li { @extend .nav-item; } + .banner .nav a { @extend .nav-link; } diff --git a/resources/assets/styles/layouts/_pages.scss b/resources/assets/styles/layouts/_pages.scss index e69de29bb2..eefac62eaa 100644 --- a/resources/assets/styles/layouts/_pages.scss +++ b/resources/assets/styles/layouts/_pages.scss @@ -0,0 +1,3 @@ +/* + | Page-specific Styles. + */ diff --git a/resources/assets/styles/layouts/_posts.scss b/resources/assets/styles/layouts/_posts.scss index e69de29bb2..43cdebb4ac 100644 --- a/resources/assets/styles/layouts/_posts.scss +++ b/resources/assets/styles/layouts/_posts.scss @@ -0,0 +1,3 @@ +/* + | Site Post Styles. + */ diff --git a/resources/assets/styles/layouts/_sidebar.scss b/resources/assets/styles/layouts/_sidebar.scss index e69de29bb2..ac9f50ee39 100644 --- a/resources/assets/styles/layouts/_sidebar.scss +++ b/resources/assets/styles/layouts/_sidebar.scss @@ -0,0 +1,3 @@ +/* + | Site Sidebar Styles. + */ diff --git a/resources/assets/styles/main.scss b/resources/assets/styles/main.scss index 171457fdc5..9852cdaa28 100644 --- a/resources/assets/styles/main.scss +++ b/resources/assets/styles/main.scss @@ -3,6 +3,7 @@ // Import npm dependencies @import "~bootstrap/scss/bootstrap"; +// Import theme styles @import "common/global"; @import "components/buttons"; @import "components/comments"; From da353de6eeb9da3b51c2be8c409a7c6be788214b Mon Sep 17 00:00:00 2001 From: Russell Fair Date: Wed, 3 May 2017 17:26:51 +0000 Subject: [PATCH 08/19] update inline documentation to reflect correct theme file locations --- resources/functions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/functions.php b/resources/functions.php index a92aa275af..7c579f5dba 100644 --- a/resources/functions.php +++ b/resources/functions.php @@ -59,12 +59,12 @@ /** * Here's what's happening with these hooks: - * 1. WordPress initially detects theme in themes/sage + * 1. WordPress initially detects theme in themes/sage/resources * 2. Upon activation, we tell WordPress that the theme is actually in themes/sage/resources/views - * 3. When we call get_template_directory() or get_template_directory_uri(), we point it back to themes/sage + * 3. When we call get_template_directory() or get_template_directory_uri(), we point it back to themes/sage/resources * * We do this so that the Template Hierarchy will look in themes/sage/resources/views for core WordPress themes - * But functions.php, style.css, and index.php are all still located in themes/sage + * But functions.php, style.css, and index.php are all still located in themes/sage/resources * * This is not compatible with the WordPress Customizer theme preview prior to theme activation * From c304c3041dcba8ab71d4b2d3d68dc29407d9b7a7 Mon Sep 17 00:00:00 2001 From: Julien Melissas Date: Tue, 6 Jun 2017 16:15:34 -0400 Subject: [PATCH 09/19] Optimize CSS Assets safe = true (#1901) Related: https://github.com/roots/sage/pull/1610#issuecomment-182969178 oh word! --- resources/assets/build/webpack.config.optimize.js | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/build/webpack.config.optimize.js b/resources/assets/build/webpack.config.optimize.js index 666c94535a..9480cfc0ed 100644 --- a/resources/assets/build/webpack.config.optimize.js +++ b/resources/assets/build/webpack.config.optimize.js @@ -14,6 +14,7 @@ module.exports = { cssProcessorOptions: { discardComments: { removeAll: true }, autoprefixer: {}, + safe: true, }, canPrint: true, }), From e170c3887c516ec208e8259683c89231a4d505c2 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Sun, 11 Jun 2017 17:30:42 -0600 Subject: [PATCH 10/19] Add soberwp/controller --- README.md | 10 +- composer.json | 3 +- composer.lock | 226 ++++++++++++++++++++++++++++++++- resources/controllers/.gitkeep | 0 4 files changed, 231 insertions(+), 8 deletions(-) create mode 100644 resources/controllers/.gitkeep diff --git a/README.md b/README.md index c4fbf55214..3b25dbd4b6 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,8 @@ Sage is a WordPress starter theme with a modern development workflow. * ES6 for JavaScript * [Webpack](https://webpack.github.io/) for compiling assets, optimizing images, and concatenating and minifying files * [Browsersync](http://www.browsersync.io/) for synchronized browser testing -* [Laravel's Blade](https://laravel.com/docs/5.3/blade) as a templating engine +* [Laravel Blade](https://laravel.com/docs/5.3/blade) as a templating engine +* [Controller](https://github.com/soberwp/controller) for passing data to Blade templates * CSS framework options: * [Bootstrap 4](http://getbootstrap.com/) * [Foundation](http://foundation.zurb.com/) @@ -22,10 +23,6 @@ Sage is a WordPress starter theme with a modern development workflow. See a working example at [roots-example-project.com](https://roots-example-project.com/). -### Recommended extensions - -* [Controller](https://github.com/soberwp/controller) — WordPress plugin to enable a basic controller when using Blade with Sage 9 - ## Requirements Make sure all dependencies have been installed before moving on: @@ -75,6 +72,7 @@ themes/your-theme-name/ # → Root of your Sage based theme │ │ ├── images/ # → Theme images │ │ ├── scripts/ # → Theme JS │ │ └── styles/ # → Theme stylesheets +│ ├── controllers/ # → Controller files │ ├── functions.php # → Composer autoloader, theme includes │ ├── index.php # → Never manually edit │ ├── screenshot.png # → Theme screenshot for WP admin @@ -108,6 +106,8 @@ Sage 8 documentation is available at [https://roots.io/sage/docs/](https://roots Sage 9 documentation is currently in progress and can be viewed at [https://github.com/roots/docs/tree/sage-9/sage](https://github.com/roots/docs/tree/sage-9/sage). +Controller documentation is available at [https://github.com/soberwp/controller#usage](https://github.com/soberwp/controller#usage). + ## Contributing Contributions are welcome from everyone. We have [contributing guidelines](https://github.com/roots/guidelines/blob/master/CONTRIBUTING.md) to help you get started. diff --git a/composer.json b/composer.json index 0eccc7eaf6..6b11784394 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,8 @@ "php": ">=5.6.4", "composer/installers": "~1.0", "illuminate/view": "~5.4.0", - "illuminate/config": "~5.4.0" + "illuminate/config": "~5.4.0", + "soberwp/controller": "9.0.0-beta.3" }, "require-dev": { "squizlabs/php_codesniffer": "^2.8.0" diff --git a/composer.lock b/composer.lock index 97a25cbd43..f3c4ed3ca9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,64 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "ea9fa1afa3655447aadf2168ebe1d9b4", + "content-hash": "e1b60e480a0c3c964418f9f47cb49faf", "packages": [ + { + "name": "brain/hierarchy", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/Brain-WP/Hierarchy.git", + "reference": "adb52da233e586051a577ef5eabe2c537df785d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Brain-WP/Hierarchy/zipball/adb52da233e586051a577ef5eabe2c537df785d5", + "reference": "adb52da233e586051a577ef5eabe2c537df785d5", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "antecedent/patchwork": "~1.3.0", + "brain/monkey": "~1.2", + "gmazzap/andrew": "~1.0", + "mockery/mockery": "0.9.3", + "phpunit/phpunit": "~4.8", + "symfony/finder": "~2.7.0" + }, + "suggest": { + "symfony/finder": "Allows loading of templates using Symfony finder component." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev", + "dev-dev": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Brain\\Hierarchy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Giuseppe Mazzapica", + "email": "giuseppe.mazzapica@gmail.com" + } + ], + "description": "No-dependencies package that embodies WordPress template hierarchy", + "keywords": [ + "wordpress" + ], + "time": "2016-09-15T13:33:53+00:00" + }, { "name": "composer/installers", "version": "v1.2.0", @@ -180,6 +236,63 @@ ], "time": "2015-11-06T14:35:42+00:00" }, + { + "name": "hassankhan/config", + "version": "0.10.0", + "source": { + "type": "git", + "url": "https://github.com/hassankhan/config.git", + "reference": "06ac500348af033f1a2e44dc357ca86282626d4a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hassankhan/config/zipball/06ac500348af033f1a2e44dc357ca86282626d4a", + "reference": "06ac500348af033f1a2e44dc357ca86282626d4a", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "scrutinizer/ocular": "~1.1", + "squizlabs/php_codesniffer": "~2.2" + }, + "suggest": { + "symfony/yaml": "~2.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Noodlehaus\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Hassan Khan", + "homepage": "http://hassankhan.me/", + "role": "Developer" + } + ], + "description": "Lightweight configuration file loader that supports PHP, INI, XML, JSON, and YAML files", + "homepage": "http://hassankhan.me/config/", + "keywords": [ + "config", + "configuration", + "ini", + "json", + "microphp", + "unframework", + "xml", + "yaml", + "yml" + ], + "time": "2016-02-11T16:21:17+00:00" + }, { "name": "illuminate/config", "version": "v5.4.17", @@ -604,6 +717,58 @@ ], "time": "2016-10-10T12:19:37+00:00" }, + { + "name": "soberwp/controller", + "version": "9.0.0-beta.3", + "source": { + "type": "git", + "url": "https://github.com/soberwp/controller.git", + "reference": "54cfd29e8695960421d9dda1b177a04c9e76aa9f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/soberwp/controller/zipball/54cfd29e8695960421d9dda1b177a04c9e76aa9f", + "reference": "54cfd29e8695960421d9dda1b177a04c9e76aa9f", + "shasum": "" + }, + "require": { + "brain/hierarchy": "^2.3", + "composer/installers": "~1.0", + "hassankhan/config": "^0.10.0", + "php": ">=5.6.0", + "symfony/yaml": "^3.2" + }, + "require-dev": { + "squizlabs/php_codesniffer": "2.*" + }, + "type": "package", + "autoload": { + "psr-4": { + "Sober\\Controller\\": "src/", + "Sober\\Controller\\Module\\": "src/Module/" + }, + "files": [ + "controller.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Darren Jacoby", + "email": "darren@jacoby.co.za", + "homepage": "https://github.com/darrenjacoby" + } + ], + "description": "WordPress package to enable a basic controller when using Blade with Sage 9", + "homepage": "https://github.com/soberwp", + "keywords": [ + "wordpress" + ], + "time": "2017-06-03T21:30:54+00:00" + }, { "name": "symfony/debug", "version": "v3.2.7", @@ -709,6 +874,61 @@ "description": "Symfony Finder Component", "homepage": "https://symfony.com", "time": "2017-03-20T09:32:19+00:00" + }, + { + "name": "symfony/yaml", + "version": "v3.3.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/9752a30000a8ca9f4b34b5227d15d0101b96b063", + "reference": "9752a30000a8ca9f4b34b5227d15d0101b96b063", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "symfony/console": "~2.8|~3.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2017-06-02T22:05:06+00:00" } ], "packages-dev": [ @@ -793,7 +1013,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "soberwp/controller": 10 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/resources/controllers/.gitkeep b/resources/controllers/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 From 7e02fdbb6b68d0a40ca3230eab19e04c58522cfe Mon Sep 17 00:00:00 2001 From: Ben Word Date: Sun, 11 Jun 2017 17:53:22 -0600 Subject: [PATCH 11/19] Update comments, add some more --- resources/assets/styles/common/_global.scss | 4 +--- resources/assets/styles/common/_variables.scss | 2 ++ resources/assets/styles/components/_buttons.scss | 4 +--- resources/assets/styles/components/_comments.scss | 1 + resources/assets/styles/layouts/_footer.scss | 4 +--- resources/assets/styles/layouts/_header.scss | 1 + resources/assets/styles/layouts/_pages.scss | 4 +--- resources/assets/styles/layouts/_posts.scss | 4 +--- resources/assets/styles/layouts/_sidebar.scss | 4 +--- resources/assets/styles/layouts/_tinymce.scss | 2 ++ 10 files changed, 12 insertions(+), 18 deletions(-) diff --git a/resources/assets/styles/common/_global.scss b/resources/assets/styles/common/_global.scss index 657a224e06..25a3f0b699 100644 --- a/resources/assets/styles/common/_global.scss +++ b/resources/assets/styles/common/_global.scss @@ -1,3 +1 @@ -/* - | Global Theme Styles. - */ +// Base styles diff --git a/resources/assets/styles/common/_variables.scss b/resources/assets/styles/common/_variables.scss index 078c5cb94b..8a365d976c 100644 --- a/resources/assets/styles/common/_variables.scss +++ b/resources/assets/styles/common/_variables.scss @@ -1,2 +1,4 @@ +// Variables + // Colors $brand-primary: #27ae60; diff --git a/resources/assets/styles/components/_buttons.scss b/resources/assets/styles/components/_buttons.scss index 0dbb070b3f..c202a637cf 100644 --- a/resources/assets/styles/components/_buttons.scss +++ b/resources/assets/styles/components/_buttons.scss @@ -1,3 +1 @@ -/* - | Theme Button Styles. - */ +// Buttons diff --git a/resources/assets/styles/components/_comments.scss b/resources/assets/styles/components/_comments.scss index baaff86f8b..922fd0c0f2 100644 --- a/resources/assets/styles/components/_comments.scss +++ b/resources/assets/styles/components/_comments.scss @@ -1,3 +1,4 @@ +// Comments .comment-list { @extend .list-unstyled; } diff --git a/resources/assets/styles/layouts/_footer.scss b/resources/assets/styles/layouts/_footer.scss index 5e1bb0670f..44848fd6c2 100644 --- a/resources/assets/styles/layouts/_footer.scss +++ b/resources/assets/styles/layouts/_footer.scss @@ -1,3 +1 @@ -/* - | Site Footer Styles. - */ +// Footer diff --git a/resources/assets/styles/layouts/_header.scss b/resources/assets/styles/layouts/_header.scss index fca4956829..8b11e1f5de 100644 --- a/resources/assets/styles/layouts/_header.scss +++ b/resources/assets/styles/layouts/_header.scss @@ -1,3 +1,4 @@ +// Header .banner .nav li { @extend .nav-item; } diff --git a/resources/assets/styles/layouts/_pages.scss b/resources/assets/styles/layouts/_pages.scss index eefac62eaa..26ca20fee3 100644 --- a/resources/assets/styles/layouts/_pages.scss +++ b/resources/assets/styles/layouts/_pages.scss @@ -1,3 +1 @@ -/* - | Page-specific Styles. - */ +// Pages diff --git a/resources/assets/styles/layouts/_posts.scss b/resources/assets/styles/layouts/_posts.scss index 43cdebb4ac..b18806bbce 100644 --- a/resources/assets/styles/layouts/_posts.scss +++ b/resources/assets/styles/layouts/_posts.scss @@ -1,3 +1 @@ -/* - | Site Post Styles. - */ +// Posts diff --git a/resources/assets/styles/layouts/_sidebar.scss b/resources/assets/styles/layouts/_sidebar.scss index ac9f50ee39..b2fa83cbff 100644 --- a/resources/assets/styles/layouts/_sidebar.scss +++ b/resources/assets/styles/layouts/_sidebar.scss @@ -1,3 +1 @@ -/* - | Site Sidebar Styles. - */ +// Sidebar diff --git a/resources/assets/styles/layouts/_tinymce.scss b/resources/assets/styles/layouts/_tinymce.scss index 7a91799444..dae912d29a 100644 --- a/resources/assets/styles/layouts/_tinymce.scss +++ b/resources/assets/styles/layouts/_tinymce.scss @@ -1,3 +1,5 @@ +// TinyMCE Editor styles + body#tinymce { margin: 12px !important; } From 94b172f85c1b992f3a8eda4722f33c2e5186a5df Mon Sep 17 00:00:00 2001 From: Raquelle Fahle Date: Sun, 11 Jun 2017 19:43:20 -0500 Subject: [PATCH 12/19] Remove post format reference in template call --- resources/views/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index f91575cd08..c532f3fbe7 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -11,7 +11,7 @@ @endif @while (have_posts()) @php(the_post()) - @include ('partials.content-'.(get_post_type() !== 'post' ? get_post_type() : get_post_format())) + @include ('partials.content-'.(get_post_type() !== 'post' ?: get_post_type())) @endwhile {!! get_the_posts_navigation() !!} From 870306960724536ab9b1272e3a1369c92a37c606 Mon Sep 17 00:00:00 2001 From: Raquelle Fahle Date: Sun, 11 Jun 2017 20:59:49 -0500 Subject: [PATCH 13/19] Update operator for template call --- resources/views/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index c532f3fbe7..3e0a8d2325 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -11,7 +11,7 @@ @endif @while (have_posts()) @php(the_post()) - @include ('partials.content-'.(get_post_type() !== 'post' ?: get_post_type())) + @include ('partials.content-'.(get_post_type() === 'post' ?: get_post_type())) @endwhile {!! get_the_posts_navigation() !!} From 6b3d44857b80802dd82d5a657c14828135ebd015 Mon Sep 17 00:00:00 2001 From: Dave Kiss Date: Tue, 13 Jun 2017 08:47:10 -0400 Subject: [PATCH 14/19] assets -> resources/assets --- app/lib/Sage/PostCreateProject.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/lib/Sage/PostCreateProject.php b/app/lib/Sage/PostCreateProject.php index 359d592a4c..19d78f8e15 100755 --- a/app/lib/Sage/PostCreateProject.php +++ b/app/lib/Sage/PostCreateProject.php @@ -70,8 +70,8 @@ public static function selectFramework(Event $event) break; case 2: file_put_contents('package.json', preg_replace("/{$default_framework_pattern}/", '"tachyons-sass": "^4.7.1"', file_get_contents('package.json'))); - file_put_contents('assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~tachyons-sass/tachyons";' . "\n", file_get_contents('assets/styles/main.scss'))); - file_put_contents('assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('assets/scripts/main.js'))); + file_put_contents('resources/assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~tachyons-sass/tachyons";' . "\n", file_get_contents('resources/assets/styles/main.scss'))); + file_put_contents('resources/assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('resources/assets/scripts/main.js'))); foreach($files_to_clear as $file) { file_put_contents($file, ''); } From 43cbd1ec90deb9cea9be23b6bc4f0e79e5422a8c Mon Sep 17 00:00:00 2001 From: Ben Word Date: Tue, 13 Jun 2017 10:27:15 -0600 Subject: [PATCH 15/19] Use latest Controller (https://github.com/soberwp/controller/pull/26) --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 6b11784394..551095bb20 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "composer/installers": "~1.0", "illuminate/view": "~5.4.0", "illuminate/config": "~5.4.0", - "soberwp/controller": "9.0.0-beta.3" + "soberwp/controller": "dev-master" }, "require-dev": { "squizlabs/php_codesniffer": "^2.8.0" diff --git a/composer.lock b/composer.lock index f3c4ed3ca9..9d68c4e521 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "e1b60e480a0c3c964418f9f47cb49faf", + "content-hash": "0b1470920d1b38f8ed13b807488e729e", "packages": [ { "name": "brain/hierarchy", @@ -719,16 +719,16 @@ }, { "name": "soberwp/controller", - "version": "9.0.0-beta.3", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/soberwp/controller.git", - "reference": "54cfd29e8695960421d9dda1b177a04c9e76aa9f" + "reference": "6b3a28840845261822cdc31c2359db6901e9e209" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/soberwp/controller/zipball/54cfd29e8695960421d9dda1b177a04c9e76aa9f", - "reference": "54cfd29e8695960421d9dda1b177a04c9e76aa9f", + "url": "https://api.github.com/repos/soberwp/controller/zipball/6b3a28840845261822cdc31c2359db6901e9e209", + "reference": "6b3a28840845261822cdc31c2359db6901e9e209", "shasum": "" }, "require": { @@ -767,7 +767,7 @@ "keywords": [ "wordpress" ], - "time": "2017-06-03T21:30:54+00:00" + "time": "2017-06-12 18:41:19" }, { "name": "symfony/debug", @@ -1014,7 +1014,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "soberwp/controller": 10 + "soberwp/controller": 20 }, "prefer-stable": false, "prefer-lowest": false, From 3849192cc76a5d4109ac5c4607c577f278de7e24 Mon Sep 17 00:00:00 2001 From: Sam Rapaport Date: Tue, 13 Jun 2017 09:45:42 -0700 Subject: [PATCH 16/19] Don't remove comments when clearing files. --- app/lib/Sage/PostCreateProject.php | 35 +++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/app/lib/Sage/PostCreateProject.php b/app/lib/Sage/PostCreateProject.php index 19d78f8e15..8d1a632bb9 100755 --- a/app/lib/Sage/PostCreateProject.php +++ b/app/lib/Sage/PostCreateProject.php @@ -12,7 +12,7 @@ public static function updateHeaders(Event $event) $io = $event->getIO(); if ($io->isInteractive()) { - $io->write('Define theme headers. Press enter key for default.'); + $io->write('Define theme headers. Press enter key for default. (sam)'); $theme_headers_default = [ 'name' => 'Sage Starter Theme', @@ -64,30 +64,45 @@ public static function selectFramework(Event $event) file_put_contents('package.json', preg_replace("/{$default_framework_pattern}/", '"foundation-sites": "6.3.0"', file_get_contents('package.json'))); file_put_contents('resources/assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~foundation-sites/scss/foundation";' . "\n" . '@include foundation-everything;' . "\n", file_get_contents('resources/assets/styles/main.scss'))); file_put_contents('resources/assets/scripts/main.js', str_replace("import 'bootstrap';\n", "import 'foundation-sites/dist/js/foundation';\n", file_get_contents('resources/assets/scripts/main.js'))); - foreach($files_to_clear as $file) { - file_put_contents($file, ''); - } + + static::clearFiles($files_to_clear); + break; case 2: file_put_contents('package.json', preg_replace("/{$default_framework_pattern}/", '"tachyons-sass": "^4.7.1"', file_get_contents('package.json'))); file_put_contents('resources/assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~tachyons-sass/tachyons";' . "\n", file_get_contents('resources/assets/styles/main.scss'))); file_put_contents('resources/assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('resources/assets/scripts/main.js'))); - foreach($files_to_clear as $file) { - file_put_contents($file, ''); - } + + static::clearFiles($files_to_clear); + break; case 3: file_put_contents('package.json', preg_replace("/\s+{$default_framework_pattern},/", '', file_get_contents('package.json'))); file_put_contents('resources/assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '', file_get_contents('resources/assets/styles/main.scss'))); file_put_contents('resources/assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('resources/assets/scripts/main.js'))); - foreach($files_to_clear as $file) { - file_put_contents($file, ''); - } + + static::clearFiles($files_to_clear); + break; } } } + public static function clearFiles(array $files) + { + foreach($files as $file) { + // First, we will pull the comment from the first line of each file + // we want to empty. Stylelint does not allow empty files. + if ($handle = fopen($file, 'r')) { + $comment = fgets($handle); + fclose($handle); + } + + // Finally, we will replace the file's contents with just the comment. + file_put_contents($file, $comment); + } + } + public static function addFontAwesome(Event $event) { $io = $event->getIO(); From 95acfe2ff565cdec03b7c5c31e27fa1f0d1e5293 Mon Sep 17 00:00:00 2001 From: Sam Rapaport Date: Tue, 13 Jun 2017 09:47:19 -0700 Subject: [PATCH 17/19] Remove test output. --- app/lib/Sage/PostCreateProject.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/Sage/PostCreateProject.php b/app/lib/Sage/PostCreateProject.php index 8d1a632bb9..e1d84f13f8 100755 --- a/app/lib/Sage/PostCreateProject.php +++ b/app/lib/Sage/PostCreateProject.php @@ -12,7 +12,7 @@ public static function updateHeaders(Event $event) $io = $event->getIO(); if ($io->isInteractive()) { - $io->write('Define theme headers. Press enter key for default. (sam)'); + $io->write('Define theme headers. Press enter key for default.'); $theme_headers_default = [ 'name' => 'Sage Starter Theme', From 98e4d4d09d9ce91d1c1a8a0c31c68135bd29c0c0 Mon Sep 17 00:00:00 2001 From: Raquelle Fahle Date: Wed, 14 Jun 2017 16:41:42 -0500 Subject: [PATCH 18/19] Change syntax of template call to match other files in views/ --- resources/views/single.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/single.blade.php b/resources/views/single.blade.php index b94c206716..cf60c3efa0 100644 --- a/resources/views/single.blade.php +++ b/resources/views/single.blade.php @@ -2,6 +2,6 @@ @section('content') @while(have_posts()) @php(the_post()) - @include('partials/content-single-'.get_post_type()) + @include('partials.content-single-'.get_post_type()) @endwhile @endsection From ca808db74812a380aefb193731485fe90625b314 Mon Sep 17 00:00:00 2001 From: Darren Jacoby Date: Wed, 21 Jun 2017 17:29:41 +0200 Subject: [PATCH 19/19] Controller examples --- resources/controllers/About.php | 10 ++++++++++ resources/controllers/App.php | 13 +++++++++++++ resources/controllers/Home.php | 10 ++++++++++ 3 files changed, 33 insertions(+) create mode 100644 resources/controllers/About.php create mode 100644 resources/controllers/App.php create mode 100644 resources/controllers/Home.php diff --git a/resources/controllers/About.php b/resources/controllers/About.php new file mode 100644 index 0000000000..54f1039d3c --- /dev/null +++ b/resources/controllers/About.php @@ -0,0 +1,10 @@ +