From 7b45a8c1c11bc577e855e585829e719a7b1c163c Mon Sep 17 00:00:00 2001 From: Ian Dunn Date: Tue, 24 Sep 2019 16:49:28 -0700 Subject: [PATCH] Theme: Move above `pub/` folder to avoid clutter from sync commits. --- themes/wporg-5ftf/Gruntfile.js | 4 +- themes/wporg-5ftf/README.md | 25 +++++++++++ themes/wporg-5ftf/css/base/_base.scss | 14 +++---- .../css/components/_components.scss | 42 +++++++++---------- themes/wporg-5ftf/css/generic/_generic.scss | 4 +- themes/wporg-5ftf/css/objects/_objects.scss | 16 +++---- themes/wporg-5ftf/css/settings/_settings.scss | 8 ++-- themes/wporg-5ftf/css/tools/_tools.scss | 6 +-- themes/wporg-5ftf/style.css | 8 +--- 9 files changed, 74 insertions(+), 53 deletions(-) create mode 100644 themes/wporg-5ftf/README.md diff --git a/themes/wporg-5ftf/Gruntfile.js b/themes/wporg-5ftf/Gruntfile.js index fb86568..8b64311 100644 --- a/themes/wporg-5ftf/Gruntfile.js +++ b/themes/wporg-5ftf/Gruntfile.js @@ -54,7 +54,7 @@ module.exports = function( grunt ) { var files = {}; ['settings', 'tools', 'generic', 'base', 'objects', 'components', 'trumps'].forEach( function( component ) { - var paths = ['../wporg/css/' + component + '/**/*.scss', '!../wporg/css/' + component + '/_' + component + '.scss']; + var paths = ['../pub/wporg/css/' + component + '/**/*.scss', '!../pub/wporg/css/' + component + '/_' + component + '.scss']; if ( isChild ) { paths.push( 'css/' + component + '/**/*.scss' ); @@ -72,7 +72,7 @@ module.exports = function( grunt ) { watch: { css: { - files: ['**/*.scss', '../wporg/css/**/*scss'], + files: ['**/*.scss', '../pub/wporg/css/**/*scss'], tasks: ['css'] } } diff --git a/themes/wporg-5ftf/README.md b/themes/wporg-5ftf/README.md new file mode 100644 index 0000000..f440832 --- /dev/null +++ b/themes/wporg-5ftf/README.md @@ -0,0 +1,25 @@ +### WordPress.org Five for the Future + +Plugins and themes for [the Five for the Future subsite](https://wordpress.org/five-for-the-future). + + +## Developing + +``` +npm install +grunt watch +``` + +Make CSS changes in the `css/` folder, and `css/style.css` will be rebuilt automatically. + + +## Committing + +Before committing changes to `css/`, please run `grunt build` to keep the file size down. + + +## Miscellaneous + +The canonical source for this project is [github.com/WordPress/five-for-the-future](https://github.com/WordPress/five-for-the-future). The contents are synced to the dotorg SVN repo to run on production, because we don't deploy directly from GitHub, for reliability reasons. + +The production copy lives in `themes/` instead of `themes/pub`, because it's already open in GitHub, and we don't want to clutter the Meta repo logs and Slack channels with noise from "Syncing w/ Git repository..." commits. diff --git a/themes/wporg-5ftf/css/base/_base.scss b/themes/wporg-5ftf/css/base/_base.scss index 45d543a..40ac1a2 100644 --- a/themes/wporg-5ftf/css/base/_base.scss +++ b/themes/wporg-5ftf/css/base/_base.scss @@ -1,7 +1,7 @@ -@import "../../../wporg/css/base/copy"; -@import "../../../wporg/css/base/elements"; -@import "../../../wporg/css/base/headings"; -@import "../../../wporg/css/base/links"; -@import "../../../wporg/css/base/lists"; -@import "../../../wporg/css/base/tables"; -@import "../../../wporg/css/base/typography"; +@import "../../../pub/wporg/css/base/copy"; +@import "../../../pub/wporg/css/base/elements"; +@import "../../../pub/wporg/css/base/headings"; +@import "../../../pub/wporg/css/base/links"; +@import "../../../pub/wporg/css/base/lists"; +@import "../../../pub/wporg/css/base/tables"; +@import "../../../pub/wporg/css/base/typography"; diff --git a/themes/wporg-5ftf/css/components/_components.scss b/themes/wporg-5ftf/css/components/_components.scss index 8d5ced3..72568ac 100644 --- a/themes/wporg-5ftf/css/components/_components.scss +++ b/themes/wporg-5ftf/css/components/_components.scss @@ -1,24 +1,24 @@ -@import "../../../wporg/css/components/404"; -@import "../../../wporg/css/components/comments"; -@import "../../../wporg/css/components/entry-content"; -@import "../../../wporg/css/components/entry-header"; -@import "../../../wporg/css/components/entry-meta"; -@import "../../../wporg/css/components/entry-summary"; -@import "../../../wporg/css/components/entry"; -@import "../../../wporg/css/components/gallery"; -@import "../../../wporg/css/components/main-navigation"; -@import "../../../wporg/css/components/page"; -@import "../../../wporg/css/components/post-navigation"; -@import "../../../wporg/css/components/posts-navigation"; -@import "../../../wporg/css/components/search-form"; -@import "../../../wporg/css/components/search"; -@import "../../../wporg/css/components/site-content"; -@import "../../../wporg/css/components/site-description"; -@import "../../../wporg/css/components/site-header"; -@import "../../../wporg/css/components/site-title"; -@import "../../../wporg/css/components/widget-area"; -@import "../../../wporg/css/components/wporg-footer"; -@import "../../../wporg/css/components/wporg-header"; +@import "../../../pub/wporg/css/components/404"; +@import "../../../pub/wporg/css/components/comments"; +@import "../../../pub/wporg/css/components/entry-content"; +@import "../../../pub/wporg/css/components/entry-header"; +@import "../../../pub/wporg/css/components/entry-meta"; +@import "../../../pub/wporg/css/components/entry-summary"; +@import "../../../pub/wporg/css/components/entry"; +@import "../../../pub/wporg/css/components/gallery"; +@import "../../../pub/wporg/css/components/main-navigation"; +@import "../../../pub/wporg/css/components/page"; +@import "../../../pub/wporg/css/components/post-navigation"; +@import "../../../pub/wporg/css/components/posts-navigation"; +@import "../../../pub/wporg/css/components/search-form"; +@import "../../../pub/wporg/css/components/search"; +@import "../../../pub/wporg/css/components/site-content"; +@import "../../../pub/wporg/css/components/site-description"; +@import "../../../pub/wporg/css/components/site-header"; +@import "../../../pub/wporg/css/components/site-title"; +@import "../../../pub/wporg/css/components/widget-area"; +@import "../../../pub/wporg/css/components/wporg-footer"; +@import "../../../pub/wporg/css/components/wporg-header"; @import "about"; @import "child-pages"; @import "entry-content"; diff --git a/themes/wporg-5ftf/css/generic/_generic.scss b/themes/wporg-5ftf/css/generic/_generic.scss index 802e6e9..f1b953e 100644 --- a/themes/wporg-5ftf/css/generic/_generic.scss +++ b/themes/wporg-5ftf/css/generic/_generic.scss @@ -1,2 +1,2 @@ -@import "../../../wporg/css/generic/kube"; -@import "../../../wporg/css/generic/normalize"; +@import "../../../pub/wporg/css/generic/kube"; +@import "../../../pub/wporg/css/generic/normalize"; diff --git a/themes/wporg-5ftf/css/objects/_objects.scss b/themes/wporg-5ftf/css/objects/_objects.scss index 39f7a5f..269b5b9 100644 --- a/themes/wporg-5ftf/css/objects/_objects.scss +++ b/themes/wporg-5ftf/css/objects/_objects.scss @@ -1,11 +1,11 @@ -@import "../../../wporg/css/objects/accessibility"; -@import "../../../wporg/css/objects/alignments"; -@import "../../../wporg/css/objects/buttons"; -@import "../../../wporg/css/objects/clearings"; -@import "../../../wporg/css/objects/copy"; -@import "../../../wporg/css/objects/inputs"; -@import "../../../wporg/css/objects/links"; -@import "../../../wporg/css/objects/notices"; +@import "../../../pub/wporg/css/objects/accessibility"; +@import "../../../pub/wporg/css/objects/alignments"; +@import "../../../pub/wporg/css/objects/buttons"; +@import "../../../pub/wporg/css/objects/clearings"; +@import "../../../pub/wporg/css/objects/copy"; +@import "../../../pub/wporg/css/objects/inputs"; +@import "../../../pub/wporg/css/objects/links"; +@import "../../../pub/wporg/css/objects/notices"; @import "buttons"; @import "parallelogram"; @import "site-header"; diff --git a/themes/wporg-5ftf/css/settings/_settings.scss b/themes/wporg-5ftf/css/settings/_settings.scss index e5e4b9a..0dbc037 100644 --- a/themes/wporg-5ftf/css/settings/_settings.scss +++ b/themes/wporg-5ftf/css/settings/_settings.scss @@ -1,4 +1,4 @@ -@import "../../../wporg/css/settings/colors"; -@import "../../../wporg/css/settings/modular-scale"; -@import "../../../wporg/css/settings/structure"; -@import "../../../wporg/css/settings/typography"; +@import "../../../pub/wporg/css/settings/colors"; +@import "../../../pub/wporg/css/settings/modular-scale"; +@import "../../../pub/wporg/css/settings/structure"; +@import "../../../pub/wporg/css/settings/typography"; diff --git a/themes/wporg-5ftf/css/tools/_tools.scss b/themes/wporg-5ftf/css/tools/_tools.scss index ad2cd1a..0ec466b 100644 --- a/themes/wporg-5ftf/css/tools/_tools.scss +++ b/themes/wporg-5ftf/css/tools/_tools.scss @@ -1,3 +1,3 @@ -@import "../../../wporg/css/tools/breakpoint"; -@import "../../../wporg/css/tools/kube"; -@import "../../../wporg/css/tools/modular-scale"; +@import "../../../pub/wporg/css/tools/breakpoint"; +@import "../../../pub/wporg/css/tools/kube"; +@import "../../../pub/wporg/css/tools/modular-scale"; diff --git a/themes/wporg-5ftf/style.css b/themes/wporg-5ftf/style.css index 756b27c..4bff72c 100644 --- a/themes/wporg-5ftf/style.css +++ b/themes/wporg-5ftf/style.css @@ -8,7 +8,7 @@ * License: GNU General Public License v2 or later * License URI: http://www.gnu.org/licenses/gpl-2.0.html * Text Domain: wporg - * Template: wporg + * Template: pub/wporg This theme, like WordPress, is licensed under the GPL. Use it to make something cool, have fun, and share what you've learned with others. @@ -18,10 +18,6 @@ Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/ -PLEASE DO NOT EDIT THIS FILE. - -During development, run `grunt watch`, and then make style changes to `/css`. - -Before committing, please run `grunt build` to keep the file size down. +PLEASE DO NOT EDIT THIS FILE. See README.md for instructions. Thanks!