From 611d4d9f2fdcbded5594b7e5f73277daf5bb2e7a Mon Sep 17 00:00:00 2001 From: Ben Word Date: Mon, 20 Aug 2012 19:28:36 -0500 Subject: [PATCH] Ref #525 - Move css/, img/, and js/ into assets/ --- CHANGELOG.md | 2 ++ README.md | 2 +- {css => assets/css}/app.css | 0 {css => assets/css}/bootstrap-responsive.css | 0 {css => assets/css}/bootstrap.css | 0 {css => assets/css}/editor-style.css | 0 {css => assets/css}/less/accordion.less | 0 {css => assets/css}/less/alerts.less | 0 {css => assets/css}/less/bootstrap.less | 0 {css => assets/css}/less/breadcrumbs.less | 0 {css => assets/css}/less/button-groups.less | 0 {css => assets/css}/less/buttons.less | 0 {css => assets/css}/less/carousel.less | 0 {css => assets/css}/less/close.less | 0 {css => assets/css}/less/code.less | 0 .../css}/less/component-animations.less | 0 {css => assets/css}/less/dropdowns.less | 0 {css => assets/css}/less/forms.less | 0 {css => assets/css}/less/grid.less | 0 {css => assets/css}/less/hero-unit.less | 0 {css => assets/css}/less/labels-badges.less | 0 {css => assets/css}/less/layouts.less | 0 {css => assets/css}/less/mixins.less | 0 {css => assets/css}/less/modals.less | 0 {css => assets/css}/less/navbar.less | 0 {css => assets/css}/less/navs.less | 0 {css => assets/css}/less/pager.less | 0 {css => assets/css}/less/pagination.less | 0 {css => assets/css}/less/popovers.less | 0 {css => assets/css}/less/progress-bars.less | 0 {css => assets/css}/less/reset.less | 0 .../css}/less/responsive-1200px-min.less | 0 .../css}/less/responsive-767px-max.less | 0 .../css}/less/responsive-768px-979px.less | 0 .../css}/less/responsive-navbar.less | 0 .../css}/less/responsive-utilities.less | 0 {css => assets/css}/less/responsive.less | 0 {css => assets/css}/less/scaffolding.less | 0 {css => assets/css}/less/sprites.less | 0 {css => assets/css}/less/tables.less | 0 {css => assets/css}/less/thumbnails.less | 0 {css => assets/css}/less/tooltip.less | 0 {css => assets/css}/less/type.less | 0 {css => assets/css}/less/utilities.less | 0 {css => assets/css}/less/variables.less | 0 {css => assets/css}/less/wells.less | 0 {img => assets/img}/.gitignore | 0 .../img}/glyphicons-halflings-white.png | Bin {img => assets/img}/glyphicons-halflings.png | Bin {js => assets/js}/main.js | 0 {js => assets/js}/plugins.js | 0 {js => assets/js}/vendor/jquery-1.8.0.min.js | 0 .../js}/vendor/modernizr-2.6.1.min.js | 0 lib/htaccess.php | 8 +++--- lib/scripts.php | 26 +++++++++--------- templates/head.php | 4 +-- 56 files changed, 22 insertions(+), 20 deletions(-) rename {css => assets/css}/app.css (100%) rename {css => assets/css}/bootstrap-responsive.css (100%) rename {css => assets/css}/bootstrap.css (100%) rename {css => assets/css}/editor-style.css (100%) rename {css => assets/css}/less/accordion.less (100%) rename {css => assets/css}/less/alerts.less (100%) rename {css => assets/css}/less/bootstrap.less (100%) rename {css => assets/css}/less/breadcrumbs.less (100%) rename {css => assets/css}/less/button-groups.less (100%) rename {css => assets/css}/less/buttons.less (100%) rename {css => assets/css}/less/carousel.less (100%) rename {css => assets/css}/less/close.less (100%) rename {css => assets/css}/less/code.less (100%) rename {css => assets/css}/less/component-animations.less (100%) rename {css => assets/css}/less/dropdowns.less (100%) rename {css => assets/css}/less/forms.less (100%) rename {css => assets/css}/less/grid.less (100%) rename {css => assets/css}/less/hero-unit.less (100%) rename {css => assets/css}/less/labels-badges.less (100%) rename {css => assets/css}/less/layouts.less (100%) rename {css => assets/css}/less/mixins.less (100%) rename {css => assets/css}/less/modals.less (100%) rename {css => assets/css}/less/navbar.less (100%) rename {css => assets/css}/less/navs.less (100%) rename {css => assets/css}/less/pager.less (100%) rename {css => assets/css}/less/pagination.less (100%) rename {css => assets/css}/less/popovers.less (100%) rename {css => assets/css}/less/progress-bars.less (100%) rename {css => assets/css}/less/reset.less (100%) rename {css => assets/css}/less/responsive-1200px-min.less (100%) rename {css => assets/css}/less/responsive-767px-max.less (100%) rename {css => assets/css}/less/responsive-768px-979px.less (100%) rename {css => assets/css}/less/responsive-navbar.less (100%) rename {css => assets/css}/less/responsive-utilities.less (100%) rename {css => assets/css}/less/responsive.less (100%) rename {css => assets/css}/less/scaffolding.less (100%) rename {css => assets/css}/less/sprites.less (100%) rename {css => assets/css}/less/tables.less (100%) rename {css => assets/css}/less/thumbnails.less (100%) rename {css => assets/css}/less/tooltip.less (100%) rename {css => assets/css}/less/type.less (100%) rename {css => assets/css}/less/utilities.less (100%) rename {css => assets/css}/less/variables.less (100%) rename {css => assets/css}/less/wells.less (100%) rename {img => assets/img}/.gitignore (100%) rename {img => assets/img}/glyphicons-halflings-white.png (100%) rename {img => assets/img}/glyphicons-halflings.png (100%) rename {js => assets/js}/main.js (100%) rename {js => assets/js}/plugins.js (100%) rename {js => assets/js}/vendor/jquery-1.8.0.min.js (100%) rename {js => assets/js}/vendor/modernizr-2.6.1.min.js (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17795bb..e134a30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ ### HEAD * Add MIT License * Implement scribu's [Theme Wrapper](http://scribu.net/wordpress/theme-wrappers.html) (see `base.php`) +* Move `css/`, `img/`, and `js/` folders within a new `assets/` folder * Move templates, `comments.php`, and `searchform.php` to `templates/` folder +* Rename `inc/` to `lib/` * Rename `loop-` files to `content-` * Remove all hooks * Use `templates/page-header.php` for page titles diff --git a/README.md b/README.md index 701190d..9d352b4 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Edit `lib/config.php` to enable support for major functionality and to define co * Theme wrapper * Root relative URLs * Clean URLs (no more `/wp-content/`) -* All static theme assets are rewritten to the website root (`/css/`, `/img/`, and `/js/`) +* All static theme assets are rewritten to the website root (`/assets/css/`, `/assets/img/`, and `/assets/js/`) * Cleaner HTML output of navigation menus * Cleaner output of `wp_head` and enqueued scripts/styles * Posts use the [hNews](http://microformats.org/wiki/hnews) microformat diff --git a/css/app.css b/assets/css/app.css similarity index 100% rename from css/app.css rename to assets/css/app.css diff --git a/css/bootstrap-responsive.css b/assets/css/bootstrap-responsive.css similarity index 100% rename from css/bootstrap-responsive.css rename to assets/css/bootstrap-responsive.css diff --git a/css/bootstrap.css b/assets/css/bootstrap.css similarity index 100% rename from css/bootstrap.css rename to assets/css/bootstrap.css diff --git a/css/editor-style.css b/assets/css/editor-style.css similarity index 100% rename from css/editor-style.css rename to assets/css/editor-style.css diff --git a/css/less/accordion.less b/assets/css/less/accordion.less similarity index 100% rename from css/less/accordion.less rename to assets/css/less/accordion.less diff --git a/css/less/alerts.less b/assets/css/less/alerts.less similarity index 100% rename from css/less/alerts.less rename to assets/css/less/alerts.less diff --git a/css/less/bootstrap.less b/assets/css/less/bootstrap.less similarity index 100% rename from css/less/bootstrap.less rename to assets/css/less/bootstrap.less diff --git a/css/less/breadcrumbs.less b/assets/css/less/breadcrumbs.less similarity index 100% rename from css/less/breadcrumbs.less rename to assets/css/less/breadcrumbs.less diff --git a/css/less/button-groups.less b/assets/css/less/button-groups.less similarity index 100% rename from css/less/button-groups.less rename to assets/css/less/button-groups.less diff --git a/css/less/buttons.less b/assets/css/less/buttons.less similarity index 100% rename from css/less/buttons.less rename to assets/css/less/buttons.less diff --git a/css/less/carousel.less b/assets/css/less/carousel.less similarity index 100% rename from css/less/carousel.less rename to assets/css/less/carousel.less diff --git a/css/less/close.less b/assets/css/less/close.less similarity index 100% rename from css/less/close.less rename to assets/css/less/close.less diff --git a/css/less/code.less b/assets/css/less/code.less similarity index 100% rename from css/less/code.less rename to assets/css/less/code.less diff --git a/css/less/component-animations.less b/assets/css/less/component-animations.less similarity index 100% rename from css/less/component-animations.less rename to assets/css/less/component-animations.less diff --git a/css/less/dropdowns.less b/assets/css/less/dropdowns.less similarity index 100% rename from css/less/dropdowns.less rename to assets/css/less/dropdowns.less diff --git a/css/less/forms.less b/assets/css/less/forms.less similarity index 100% rename from css/less/forms.less rename to assets/css/less/forms.less diff --git a/css/less/grid.less b/assets/css/less/grid.less similarity index 100% rename from css/less/grid.less rename to assets/css/less/grid.less diff --git a/css/less/hero-unit.less b/assets/css/less/hero-unit.less similarity index 100% rename from css/less/hero-unit.less rename to assets/css/less/hero-unit.less diff --git a/css/less/labels-badges.less b/assets/css/less/labels-badges.less similarity index 100% rename from css/less/labels-badges.less rename to assets/css/less/labels-badges.less diff --git a/css/less/layouts.less b/assets/css/less/layouts.less similarity index 100% rename from css/less/layouts.less rename to assets/css/less/layouts.less diff --git a/css/less/mixins.less b/assets/css/less/mixins.less similarity index 100% rename from css/less/mixins.less rename to assets/css/less/mixins.less diff --git a/css/less/modals.less b/assets/css/less/modals.less similarity index 100% rename from css/less/modals.less rename to assets/css/less/modals.less diff --git a/css/less/navbar.less b/assets/css/less/navbar.less similarity index 100% rename from css/less/navbar.less rename to assets/css/less/navbar.less diff --git a/css/less/navs.less b/assets/css/less/navs.less similarity index 100% rename from css/less/navs.less rename to assets/css/less/navs.less diff --git a/css/less/pager.less b/assets/css/less/pager.less similarity index 100% rename from css/less/pager.less rename to assets/css/less/pager.less diff --git a/css/less/pagination.less b/assets/css/less/pagination.less similarity index 100% rename from css/less/pagination.less rename to assets/css/less/pagination.less diff --git a/css/less/popovers.less b/assets/css/less/popovers.less similarity index 100% rename from css/less/popovers.less rename to assets/css/less/popovers.less diff --git a/css/less/progress-bars.less b/assets/css/less/progress-bars.less similarity index 100% rename from css/less/progress-bars.less rename to assets/css/less/progress-bars.less diff --git a/css/less/reset.less b/assets/css/less/reset.less similarity index 100% rename from css/less/reset.less rename to assets/css/less/reset.less diff --git a/css/less/responsive-1200px-min.less b/assets/css/less/responsive-1200px-min.less similarity index 100% rename from css/less/responsive-1200px-min.less rename to assets/css/less/responsive-1200px-min.less diff --git a/css/less/responsive-767px-max.less b/assets/css/less/responsive-767px-max.less similarity index 100% rename from css/less/responsive-767px-max.less rename to assets/css/less/responsive-767px-max.less diff --git a/css/less/responsive-768px-979px.less b/assets/css/less/responsive-768px-979px.less similarity index 100% rename from css/less/responsive-768px-979px.less rename to assets/css/less/responsive-768px-979px.less diff --git a/css/less/responsive-navbar.less b/assets/css/less/responsive-navbar.less similarity index 100% rename from css/less/responsive-navbar.less rename to assets/css/less/responsive-navbar.less diff --git a/css/less/responsive-utilities.less b/assets/css/less/responsive-utilities.less similarity index 100% rename from css/less/responsive-utilities.less rename to assets/css/less/responsive-utilities.less diff --git a/css/less/responsive.less b/assets/css/less/responsive.less similarity index 100% rename from css/less/responsive.less rename to assets/css/less/responsive.less diff --git a/css/less/scaffolding.less b/assets/css/less/scaffolding.less similarity index 100% rename from css/less/scaffolding.less rename to assets/css/less/scaffolding.less diff --git a/css/less/sprites.less b/assets/css/less/sprites.less similarity index 100% rename from css/less/sprites.less rename to assets/css/less/sprites.less diff --git a/css/less/tables.less b/assets/css/less/tables.less similarity index 100% rename from css/less/tables.less rename to assets/css/less/tables.less diff --git a/css/less/thumbnails.less b/assets/css/less/thumbnails.less similarity index 100% rename from css/less/thumbnails.less rename to assets/css/less/thumbnails.less diff --git a/css/less/tooltip.less b/assets/css/less/tooltip.less similarity index 100% rename from css/less/tooltip.less rename to assets/css/less/tooltip.less diff --git a/css/less/type.less b/assets/css/less/type.less similarity index 100% rename from css/less/type.less rename to assets/css/less/type.less diff --git a/css/less/utilities.less b/assets/css/less/utilities.less similarity index 100% rename from css/less/utilities.less rename to assets/css/less/utilities.less diff --git a/css/less/variables.less b/assets/css/less/variables.less similarity index 100% rename from css/less/variables.less rename to assets/css/less/variables.less diff --git a/css/less/wells.less b/assets/css/less/wells.less similarity index 100% rename from css/less/wells.less rename to assets/css/less/wells.less diff --git a/img/.gitignore b/assets/img/.gitignore similarity index 100% rename from img/.gitignore rename to assets/img/.gitignore diff --git a/img/glyphicons-halflings-white.png b/assets/img/glyphicons-halflings-white.png similarity index 100% rename from img/glyphicons-halflings-white.png rename to assets/img/glyphicons-halflings-white.png diff --git a/img/glyphicons-halflings.png b/assets/img/glyphicons-halflings.png similarity index 100% rename from img/glyphicons-halflings.png rename to assets/img/glyphicons-halflings.png diff --git a/js/main.js b/assets/js/main.js similarity index 100% rename from js/main.js rename to assets/js/main.js diff --git a/js/plugins.js b/assets/js/plugins.js similarity index 100% rename from js/plugins.js rename to assets/js/plugins.js diff --git a/js/vendor/jquery-1.8.0.min.js b/assets/js/vendor/jquery-1.8.0.min.js similarity index 100% rename from js/vendor/jquery-1.8.0.min.js rename to assets/js/vendor/jquery-1.8.0.min.js diff --git a/js/vendor/modernizr-2.6.1.min.js b/assets/js/vendor/modernizr-2.6.1.min.js similarity index 100% rename from js/vendor/modernizr-2.6.1.min.js rename to assets/js/vendor/modernizr-2.6.1.min.js diff --git a/lib/htaccess.php b/lib/htaccess.php index 978be88..4c75913 100644 --- a/lib/htaccess.php +++ b/lib/htaccess.php @@ -33,10 +33,10 @@ if (stristr($_SERVER['SERVER_SOFTWARE'], 'apache') || stristr($_SERVER['SERVER_S function roots_add_rewrites($content) { global $wp_rewrite; $roots_new_non_wp_rules = array( - 'css/(.*)' => THEME_PATH . '/css/$1', - 'js/(.*)' => THEME_PATH . '/js/$1', - 'img/(.*)' => THEME_PATH . '/img/$1', - 'plugins/(.*)' => RELATIVE_PLUGIN_PATH . '/$1' + 'assets/css/(.*)' => THEME_PATH . '/assets/css/$1', + 'assets/js/(.*)' => THEME_PATH . '/assets/js/$1', + 'assets/img/(.*)' => THEME_PATH . '/assets/img/$1', + 'assets/plugins/(.*)' => RELATIVE_PLUGIN_PATH . '/$1' ); $wp_rewrite->non_wp_rules = array_merge($wp_rewrite->non_wp_rules, $roots_new_non_wp_rules); return $content; diff --git a/lib/scripts.php b/lib/scripts.php index c923396..646016d 100644 --- a/lib/scripts.php +++ b/lib/scripts.php @@ -3,22 +3,22 @@ * Scripts and stylesheets * * Enqueue stylesheets in the following order: - * 1. /theme/css/bootstrap.css - * 2. /theme/css/bootstrap-responsive.css - * 3. /theme/css/app.css - * 4. /child-theme/style.css (if a child theme is activated) + * 1. /theme/assets/css/bootstrap.css + * 2. /theme/assets/css/bootstrap-responsive.css + * 3. /theme/assets/css/app.css + * 4. /child-theme/style.css (if a child theme is activated) * * Enqueue scripts in the following order: - * 1. /theme/js/vendor/modernizr-2.6.1.min.js (in head.php) - * 2. jquery-1.8.0.min.js via Google CDN (in head.php) - * 3. /theme/js/plugins.js - * 4. /theme/js/main.js + * 1. /theme/assets/js/vendor/modernizr-2.6.1.min.js (in head.php) + * 2. jquery-1.8.0.min.js via Google CDN (in head.php) + * 3. /theme/assets/js/plugins.js + * 4. /theme/assets/js/main.js */ function roots_scripts() { - wp_enqueue_style('roots_bootstrap', get_template_directory_uri() . '/css/bootstrap.css', false, null); - wp_enqueue_style('roots_bootstrap_responsive', get_template_directory_uri() . '/css/bootstrap-responsive.css', array('roots_bootstrap'), null); - wp_enqueue_style('roots_app', get_template_directory_uri() . '/css/app.css', false, null); + wp_enqueue_style('roots_bootstrap', get_template_directory_uri() . '/assets/css/bootstrap.css', false, null); + wp_enqueue_style('roots_bootstrap_responsive', get_template_directory_uri() . '/assets/css/bootstrap-responsive.css', array('roots_bootstrap'), null); + wp_enqueue_style('roots_app', get_template_directory_uri() . '/assets/css/app.css', false, null); // Load style.css from child theme if (is_child_theme()) { @@ -37,8 +37,8 @@ function roots_scripts() { wp_enqueue_script('comment-reply'); } - wp_register_script('roots_plugins', get_template_directory_uri() . '/js/plugins.js', false, null, false); - wp_register_script('roots_main', get_template_directory_uri() . '/js/main.js', false, null, false); + wp_register_script('roots_plugins', get_template_directory_uri() . '/assets/js/plugins.js', false, null, false); + wp_register_script('roots_main', get_template_directory_uri() . '/assets/js/main.js', false, null, false); wp_enqueue_script('roots_plugins'); wp_enqueue_script('roots_main'); } diff --git a/templates/head.php b/templates/head.php index 90bd010..9183d38 100644 --- a/templates/head.php +++ b/templates/head.php @@ -8,10 +8,10 @@ <?php wp_title('|', true, 'right'); bloginfo('name'); ?> - + - + \ No newline at end of file