Change assets folder name for website. Apparently the underscore wa…

…s causing the 404.

README.md

@@ -12,21 +12,21 @@ Powerful automated workflow for WordPress + [Advanced Custom Fields](http://adva
 
 ### Rapidize your development time and add robust layouts on-the-fly with the [Layouts Page Template](http://scratchtheme.com/docs/advanced/#layouts)
 
-![Scratch's Layouts in action](http://scratchtheme.com/_assets/img/marketing-page-slower.gif)
+![Scratch's Layouts in action](http://scratchtheme.com/assets/img/marketing-page-slower.gif)
 
 **NOTE:** must have [Advanced Custom Fields Pro](http://www.advancedcustomfields.com/pro) installed and activated.
 
 ### Mobile-Friendly
 
-![Mobile-Friendly](http://scratchtheme.com/_assets/img/mobile.gif)
+![Mobile-Friendly](http://scratchtheme.com/assets/img/mobile.gif)
 
 ### Save a file, and watch your site instantly refresh across all browsers & devices via [BrowserSync](http://www.browsersync.io/)
 
-![BrowserSync](http://scratchtheme.com/_assets/img/browsersync.gif)
+![BrowserSync](http://scratchtheme.com/assets/img/browsersync.gif)
 
 ### Keep your WordPress pages lightweight by [automatically optimizing images](https://github.com/gruntjs/grunt-contrib-imagemin) as you upload them to the Media Library
 
-![WordPress Image Optimization](http://scratchtheme.com/_assets/img/imagemin.gif)
+![WordPress Image Optimization](http://scratchtheme.com/assets/img/imagemin.gif)
 
 ---
 

_assets/grunt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-theme-grunt",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "dependencies": {
     "grunt": "0.4.x",
     "grunt-cli": "~0.1.13",

_assets/gulp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-theme-gulp",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "dependencies": {
     "browser-sync": "^2.11.1",
     "gulp": "^3.9.0",

_docs/acf.md

@@ -143,7 +143,7 @@ scratch_layout_declare($args, $columns, $flex = true, $offset = null, $option =
 
 To play around with this, create a new page in WordPress and set its template to "Layouts." With Scratch, you can now add robust layouts on the fly, including sliders, hero units, flexible columns, and more. In addition, you have full control over `_parts/layouts/layout-*.php` and `_layouts.scss` for customization.
 
-![Scratch's Layouts in action](/_assets/img/marketing-page.gif)
+![Scratch's Layouts in action](/assets/img/marketing-page.gif)
 
 ACF does not currently support editing the field groups themselves, but as per [this post](http://www.advancedcustomfields.com/resources/local-json/), that feature should be in the roadmap.
 

_docs/css.md

@@ -22,7 +22,7 @@ Scratch makes use of the excellent [Gutenberg](http://matejlatin.github.io/Guten
 
 ```
 scratch-theme/
-├── _assets/
+├── assets/
 │   └── scss/
 │   │   ├── config/
 │   │   │   ├── _global.scss

_docs/getting-started.md

@@ -36,7 +36,7 @@ $ cd wp-content/themes/
 $ git clone https://github.com/zackphilipps/scratch-theme.git
 ```
 
-![Getting Started Screencast](/_assets/img/screencast1.gif)
+![Getting Started Screencast](/assets/img/screencast1.gif)
 
 At this point you should install dependencies:
 
@@ -51,7 +51,7 @@ $ npm install
 
 ```
 scratch-theme/
-├── _assets/
+├── assets/
 │   ├── core/
 │   ├── css/
 │   ├── fonts/
@@ -68,7 +68,7 @@ scratch-theme/
 └── acf-json/
 ```
 
-The `_assets/` directory contains all SCSS, CSS, JS, images, and fonts as well as the `Gruntfile` and `gulpfile` and their respective `package.json` files. [There are also helpful READMEs in most directories.](https://github.com/zackphilipps/scratch-theme)
+The `assets/` directory contains all SCSS, CSS, JS, images, and fonts as well as the `Gruntfile` and `gulpfile` and their respective `package.json` files. [There are also helpful READMEs in most directories.](https://github.com/zackphilipps/scratch-theme)
 
 The `_docs/` directory contains the markdown files you are reading right now. `_includes/` has additional PHP that's loaded into `functions.php`. `_parts/` are partial templates like `header.php` and `footer.php`. `_root/` contains files that should be moved to the root of your site if you desire to use the configuration that comes with [HTML5 Boilerplate](https://github.com/h5bp/html5-boilerplate).
 

_docs/screencasts.md

@@ -11,47 +11,47 @@ Open the MAMP start page, and then head over to phpMyAdmin. Click on the _Users_
 
 Now, navigate to `localhost:xxxx` where `xxxx` is the web port you configured in MAMP's preferences. Complete the WordPress installation and log in.
 
-![Using MAMP to Complete the WordPress Installation](/_assets/img/screencast2-slower.gif)
+![Using MAMP to Complete the WordPress Installation](/assets/img/screencast2-slower.gif)
 
 ## Activating Scratch & Installing Recommended Plugins
 
 Once logged in to WordPress, navigate to _Appearance > Themes_ and activate Scratch. Follow the subsequent prompts to install the recommended plugins. If you want, delete Akismet and Hello Dolly.
 
-![Activating Scratch & Installing Recommended Plugins](/_assets/img/screencast3.gif)
+![Activating Scratch & Installing Recommended Plugins](/assets/img/screencast3.gif)
 
 ## Running Grunt, BrowserSync, and Compiling SCSS and JavaScript
 
-Run `npm install` in the `_assets/grunt/` directory from your command line to install all of the Node packages. Once that's done, you can run `grunt` from the same directory to begin your automated workflow.
+Run `npm install` in the `assets/grunt/` directory from your command line to install all of the Node packages. Once that's done, you can run `grunt` from the same directory to begin your automated workflow.
 
-**Update:** as of [v1.5.9](https://github.com/zackphilipps/scratch-theme/tree/v1.5.9), Gulp is also available. Run `npm install` and then `gulp` in the `_assets/gulp/` directory.
+**Update:** as of [v1.5.9](https://github.com/zackphilipps/scratch-theme/tree/v1.5.9), Gulp is also available. Run `npm install` and then `gulp` in the `assets/gulp/` directory.
 
-![Running Grunt, BrowserSync, and Compiling SCSS and JavaScript](/_assets/img/screencast4-pattern.gif)
+![Running Grunt, BrowserSync, and Compiling SCSS and JavaScript](/assets/img/screencast4-pattern.gif)
 
 ## Adding Scratch's Style Guide and Main Navigation Menu
 
 Navigate to _Appearance > Menus_ and click _Create Menu._ Make sure the menu points to the _Main Nav_ location, and then save it again. Next, go to _Pages > Add New_ and set the Page Template to _Style Guide._ Publish and view the page.
 
-![Adding Scratch's Style Guide and Main Navigation Menu](/_assets/img/screencast5.gif)
+![Adding Scratch's Style Guide and Main Navigation Menu](/assets/img/screencast5.gif)
 
 ## Implementing Your Own Typography with Scratch
 
-This example uses Google Fonts and sets them to SCSS variables in [config/_variables.scss](https://github.com/zackphilipps/scratch-theme/blob/master/_assets/scss/config/_variables.scss).
+This example uses Google Fonts and sets them to SCSS variables in [config/_variables.scss](https://github.com/zackphilipps/scratch-theme/blob/master/assets/scss/config/_variables.scss).
 
-![Implementing Your Own Typography with Scratch](/_assets/img/screencast6-pattern.gif)
+![Implementing Your Own Typography with Scratch](/assets/img/screencast6-pattern.gif)
 
 ## Implementing Your Own Color Scheme with Scratch
 
-Edit [config/_variables.scss](https://github.com/zackphilipps/scratch-theme/blob/master/_assets/scss/config/_variables.scss) and [page-style_guide.php](https://github.com/zackphilipps/scratch-theme/blob/master/page-style_guide.php).
+Edit [config/_variables.scss](https://github.com/zackphilipps/scratch-theme/blob/master/assets/scss/config/_variables.scss) and [page-style_guide.php](https://github.com/zackphilipps/scratch-theme/blob/master/page-style_guide.php).
 
-![Implementing Your Own Color Scheme with Scratch](/_assets/img/screencast7-pattern.gif)
+![Implementing Your Own Color Scheme with Scratch](/assets/img/screencast7-pattern.gif)
 
 ## Moving the Right Files to the Root of Your Site & Editing the Permalink Structure
 
 Basically, `_root/` contains files that should be moved to the root of your site if you desire to use the configuration that comes with [HTML5 Boilerplate](https://github.com/h5bp/html5-boilerplate).
 
 Navigate to _Settings > Permalinks_, and change the Permalink Structure to _Post Name_ for cleaner, SEO-friendly URLs.
 
-![Moving the Right Files to the Root of Your Site & Editing the Permalink Structure](/_assets/img/screencast8-pattern.gif)
+![Moving the Right Files to the Root of Your Site & Editing the Permalink Structure](/assets/img/screencast8-pattern.gif)
 
 ## Congratulations!
 

_website/default.twig

@@ -9,10 +9,10 @@
 
     <link rel="icon" href="favicon.ico?v=2">
 
-    <link rel="stylesheet" href="{{ baseUrl }}/_assets/css/master.css">
-    <link rel="stylesheet" href="{{ baseUrl }}/_assets/css/website.css">
-    <link rel="stylesheet" href="{{ baseUrl }}/_assets/css/highlight.dark.css">
-    <script src="{{ baseUrl }}/_assets/js/vendor/modernizr-2.8.3.min.js"></script>
+    <link rel="stylesheet" href="{{ baseUrl }}/assets/css/master.css">
+    <link rel="stylesheet" href="{{ baseUrl }}/assets/css/website.css">
+    <link rel="stylesheet" href="{{ baseUrl }}/assets/css/highlight.dark.css">
+    <script src="{{ baseUrl }}/assets/js/vendor/modernizr-2.8.3.min.js"></script>
   </head>
   <body>
     <!--[if lt IE 8]>
@@ -24,7 +24,7 @@
 
         <a class="logo"
            href="{{ baseUrl }}">
-          <img src="{{ baseUrl }}/_assets/img/site-logo.svg" alt="{{ title }}">
+          <img src="{{ baseUrl }}/assets/img/site-logo.svg" alt="{{ title }}">
         </a>
 
         <span class="nav-toggle"
@@ -101,7 +101,7 @@
 
     <!-- BEGIN FOOTER -->
     <script src="https://code.jquery.com/jquery-1.12.2.min.js"></script>
-    <script>window.jQuery || document.write('<script src="{{ baseUrl }}/_assets/js/vendor/jquery-1.12.2.min.js"><\/script>')</script>
+    <script>window.jQuery || document.write('<script src="{{ baseUrl }}/assets/js/vendor/jquery-1.12.2.min.js"><\/script>')</script>
 
     <script src="//yastatic.net/highlightjs/8.2/highlight.min.js"></script>
 
@@ -113,11 +113,11 @@
     </script>
 
     <!-- FOR DEVELOPMENT -->
-    <script src="{{ baseUrl }}/_assets/js/concat/main.js"></script>
+    <script src="{{ baseUrl }}/assets/js/concat/main.js"></script>
     <!-- FOR PRODUCTION -->
-    <!-- <script src="{{ baseUrl }}/_assets/js/compiled/main.min.js"></script> -->
+    <!-- <script src="{{ baseUrl }}/assets/js/compiled/main.min.js"></script> -->
 
-    <script src="{{ baseUrl }}/_assets/js/website.js"></script>
+    <script src="{{ baseUrl }}/assets/js/website.js"></script>
 
     <!-- Google Analytics: change UA-XXXXX-Y to be your site's ID. -->
     <script>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-theme",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "Scratch is the world's first Advanced Custom Fields-ready WordPress theme. It's not so much a theme as a springboard for building your own fully custom WordPress themes.",
   "repository": {
     "type": "git",

style.css

@@ -4,7 +4,7 @@ Theme URI: http://scratchtheme.com
 Author: Tribeswell LLC
 Author URI: http://tribeswell.com
 Description: Scratch is the world's first Advanced Custom Fields-ready WordPress theme. It's not so much a theme as a springboard for building your own fully custom WordPress themes.
-Version: 1.6.2
+Version: 1.6.3
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: responsive, framework