Remove underscores from directory names, remove imgFixHeight #6

zoephilipps · Sep 17, 2016 · 4575b2f · 4575b2f
1 parent 2f2ab93
commit 4575b2f
Show file tree

Hide file tree

Showing 144 changed files with 296 additions and 300 deletions.
diff --git a/404.php b/404.php
@@ -1,4 +1,4 @@
-<?php get_template_part('_parts/header'); ?>
+<?php get_template_part('parts/header'); ?>
 
 <main>
 
@@ -11,4 +11,4 @@
 
 </main>
 
-<?php get_template_part('_parts/footer'); ?>
+<?php get_template_part('parts/footer'); ?>
diff --git a/_assets/core/README.md b/_assets/core/README.md
diff --git a/_assets/core/js/gutenberg.js b/_assets/core/js/gutenberg.js
diff --git a/_assets/css/master.css b/_assets/css/master.css
diff --git a/_assets/img/README.md b/_assets/img/README.md
diff --git a/_assets/js/compiled/main.min.js b/_assets/js/compiled/main.min.js
diff --git a/_website/assets/css/master.css b/_website/assets/css/master.css
diff --git a/_website/assets/js/compiled/main.min.js b/_website/assets/js/compiled/main.min.js
diff --git a/archive-{rename}.php b/archive-{rename}.php
@@ -1,4 +1,4 @@
-<?php get_template_part('_parts/header'); ?>
+<?php get_template_part('parts/header'); ?>
 
 <main>
 
@@ -35,4 +35,4 @@
 
 </main>
 
-<?php get_template_part('_parts/footer'); ?>
+<?php get_template_part('parts/footer'); ?>
diff --git a/archive.php b/archive.php
@@ -1,4 +1,4 @@
-<?php get_template_part('_parts/header'); ?>
+<?php get_template_part('parts/header'); ?>
 
 <main>
 
@@ -38,4 +38,4 @@
 
 </main>
 
-<?php get_template_part('_parts/footer'); ?>
+<?php get_template_part('parts/footer'); ?>
diff --git a/assets/core/README.md b/assets/core/README.md
@@ -0,0 +1,7 @@
+# Scratch Theme for WordPress + ACF
+
+## Core
+
+DO NOT EDIT ANYTHING IN THIS DIRECTORY. Of course, there are exceptions to every rule.
+
+- You may delete `.js` files located in [`assets/core/js/`](https://github.com/zackphilipps/scratch-theme/tree/master/assets/core/js) if you simply don't want 'em.
diff --git a/_assets/core/js/jquery.glide.js → assets/core/js/jquery.glide.js b/_assets/core/js/jquery.glide.js → assets/core/js/jquery.glide.js
diff --git a/_assets/core/js/jquery.magnific-popup.js → assets/core/js/jquery.magnific-popup.js b/_assets/core/js/jquery.magnific-popup.js → assets/core/js/jquery.magnific-popup.js
diff --git a/_assets/core/js/jquery.velocity.js → assets/core/js/jquery.velocity.js b/_assets/core/js/jquery.velocity.js → assets/core/js/jquery.velocity.js
diff --git a/_assets/core/js/jquery.velocity.ui.js → assets/core/js/jquery.velocity.ui.js b/_assets/core/js/jquery.velocity.ui.js → assets/core/js/jquery.velocity.ui.js
diff --git a/_assets/core/js/jquery.waypoints.js → assets/core/js/jquery.waypoints.js b/_assets/core/js/jquery.waypoints.js → assets/core/js/jquery.waypoints.js
diff --git a/_assets/core/scss/_default-variables.scss → assets/core/scss/_default-variables.scss b/_assets/core/scss/_default-variables.scss → assets/core/scss/_default-variables.scss
diff --git a/_assets/core/scss/_ionicons.scss → assets/core/scss/_ionicons.scss b/_assets/core/scss/_ionicons.scss → assets/core/scss/_ionicons.scss
diff --git a/_assets/core/scss/_magnific.scss → assets/core/scss/_magnific.scss b/_assets/core/scss/_magnific.scss → assets/core/scss/_magnific.scss
diff --git a/_assets/core/scss/_main.scss → assets/core/scss/_main.scss b/_assets/core/scss/_main.scss → assets/core/scss/_main.scss
diff --git a/_assets/core/scss/_normalize.scss → assets/core/scss/_normalize.scss b/_assets/core/scss/_normalize.scss → assets/core/scss/_normalize.scss
diff --git a/_assets/core/scss/glide/_glide-core.scss → assets/core/scss/glide/_glide-core.scss b/_assets/core/scss/glide/_glide-core.scss → assets/core/scss/glide/_glide-core.scss
diff --git a/_assets/core/scss/glide/_glide-theme.scss → assets/core/scss/glide/_glide-theme.scss b/_assets/core/scss/glide/_glide-theme.scss → assets/core/scss/glide/_glide-theme.scss
diff --git a/_assets/css/README.md → assets/css/README.md b/_assets/css/README.md → assets/css/README.md
@@ -2,4 +2,4 @@
 
 ## CSS
 
-Shouldn't need to touch anything here. View the [`scss`](https://github.com/zackphilipps/scratch-theme/tree/master/_assets/scss) directory for more info.
+Shouldn't need to touch anything here. View the [`scss`](https://github.com/zackphilipps/scratch-theme/tree/master/assets/scss) directory for more info.
diff --git a/_assets/css/login.css → assets/css/login.css b/_assets/css/login.css → assets/css/login.css
diff --git a/_assets/css/login.css.map → assets/css/login.css.map b/_assets/css/login.css.map → assets/css/login.css.map
diff --git a/assets/css/master.css b/assets/css/master.css
diff --git a/_assets/css/master.css.map → assets/css/master.css.map b/_assets/css/master.css.map → assets/css/master.css.map
diff --git a/_assets/fonts/README.md → assets/fonts/README.md b/_assets/fonts/README.md → assets/fonts/README.md
@@ -2,4 +2,4 @@
 
 ## Fonts
 
-View [`config/variables.scss`](https://github.com/zackphilipps/scratch-theme/blob/master/_assets/scss/config/_variables.scss) to see where fonts are declared.
+View [`config/variables.scss`](https://github.com/zackphilipps/scratch-theme/blob/master/assets/scss/config/_variables.scss) to see where fonts are declared.
diff --git a/_assets/fonts/ionicons.eot → assets/fonts/ionicons.eot b/_assets/fonts/ionicons.eot → assets/fonts/ionicons.eot
diff --git a/_assets/fonts/ionicons.svg → assets/fonts/ionicons.svg b/_assets/fonts/ionicons.svg → assets/fonts/ionicons.svg
diff --git a/_assets/fonts/ionicons.ttf → assets/fonts/ionicons.ttf b/_assets/fonts/ionicons.ttf → assets/fonts/ionicons.ttf
diff --git a/_assets/fonts/ionicons.woff → assets/fonts/ionicons.woff b/_assets/fonts/ionicons.woff → assets/fonts/ionicons.woff
diff --git a/_assets/grunt/Gruntfile.js → assets/grunt/Gruntfile.js b/_assets/grunt/Gruntfile.js → assets/grunt/Gruntfile.js
diff --git a/_assets/grunt/README.md → assets/grunt/README.md b/_assets/grunt/README.md → assets/grunt/README.md
@@ -2,6 +2,6 @@
 
 ## Grunt.js
 
-You should only need to edit [`Gruntfile.js`](https://github.com/zackphilipps/scratch-theme/blob/master/_assets/grunt/Gruntfile.js) here.
+You should only need to edit [`Gruntfile.js`](https://github.com/zackphilipps/scratch-theme/blob/master/assets/grunt/Gruntfile.js) here.
 
 Run `npm install` in this 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.
diff --git a/_assets/grunt/package.json → assets/grunt/package.json b/_assets/grunt/package.json → assets/grunt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scratch-theme-grunt",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "dependencies": {
     "grunt": "0.4.x",
     "grunt-cli": "~0.1.13",

diff --git a/_assets/gulp/README.md → assets/gulp/README.md b/_assets/gulp/README.md → assets/gulp/README.md
@@ -2,6 +2,6 @@
 
 ## Gulp.js
 
-You should only need to edit [`gulpfile.js`](https://github.com/zackphilipps/scratch-theme/blob/master/_assets/gulp/gulpfile.js) here.
+You should only need to edit [`gulpfile.js`](https://github.com/zackphilipps/scratch-theme/blob/master/assets/gulp/gulpfile.js) here.
 
 Run `npm install` in this directory from your command line to install all of the Node packages. Once that's done, you can run `gulp` from the same directory to begin your automated workflow.
diff --git a/_assets/gulp/gulpfile.js → assets/gulp/gulpfile.js b/_assets/gulp/gulpfile.js → assets/gulp/gulpfile.js
@@ -25,16 +25,16 @@ gulp.task('images', function() {
 });
 
 gulp.task('javascript', function() {
-  return gulp.src(['../core/js/*.js', '../js/helper.js', '../js/plugins.js', '../js/acf-google-maps.js', '../js/main.js'])
+  return gulp.src(['../core/js/*.js', '../js/plugins.js', '../js/acf-google-maps.js', '../js/main.js'])
     .pipe($.concat('main.js', {
       newLine: ';'
     }))
     .pipe(gulp.dest('../js/concat/'))
-    .pipe(gulp.dest('../../_website/assets/js/concat/'))
+    .pipe(gulp.dest('../../website/assets/js/concat/'))
     .pipe($.uglify(false))
     .pipe($.rename('main.min.js'))
     .pipe(gulp.dest('../js/compiled'))
-    .pipe(gulp.dest('../../_website/assets/js/compiled'))
+    .pipe(gulp.dest('../../website/assets/js/compiled'))
     .pipe(browserSync.stream());
 });
 
@@ -49,7 +49,7 @@ gulp.task('styles', function() {
     }))
     .pipe($.sourcemaps.write())
     .pipe(gulp.dest('../css'))
-    .pipe(gulp.dest('../../_website/assets/css'))
+    .pipe(gulp.dest('../../website/assets/css'))
     .pipe(browserSync.stream());
 });
 
@@ -62,7 +62,7 @@ gulp.task('watch', function() {
 
 gulp.task('browserSync', function() {
   browserSync.init({
-    proxy: 'test.com', // change this to match your host
+    proxy: 'scratchdemo.com', // change this to match your host
     watchTask: true
   });
 });

diff --git a/_assets/gulp/package.json → assets/gulp/package.json b/_assets/gulp/package.json → assets/gulp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scratch-theme-gulp",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "dependencies": {
     "browser-sync": "^2.11.1",
     "gulp": "^3.9.0",

diff --git a/assets/img/README.md b/assets/img/README.md
@@ -0,0 +1,7 @@
+# Scratch Theme for WordPress + ACF
+
+## Images
+
+Both of the Scratch logos are referenced in [`header.php`](https://github.com/zackphilipps/scratch-theme/blob/master/parts/header.php) and [`login.scss`](https://github.com/zackphilipps/scratch-theme/blob/master/assets/scss/login.scss).
+
+It's best to either place your images in `assets/img/` or upload them via WordPress. If you choose the latter, and you've installed & activated Scratch's recommended plugins, you are also taking advantage of automated image resizing and optimization. (The optimization happens regardless with Grunt or Gulp. The WordPress plugin just handles resizing.)
diff --git a/_assets/img/login-logo.svg → assets/img/login-logo.svg b/_assets/img/login-logo.svg → assets/img/login-logo.svg
diff --git a/_assets/img/login-logo.svgz → assets/img/login-logo.svgz b/_assets/img/login-logo.svgz → assets/img/login-logo.svgz
diff --git a/_assets/img/site-logo.svg → assets/img/site-logo.svg b/_assets/img/site-logo.svg → assets/img/site-logo.svg
diff --git a/_assets/img/site-logo.svgz → assets/img/site-logo.svgz b/_assets/img/site-logo.svgz → assets/img/site-logo.svgz
diff --git a/_assets/js/README.md → assets/js/README.md b/_assets/js/README.md → assets/js/README.md
@@ -2,6 +2,6 @@
 
 ## JS
 
-View the `concat` and `uglify` tasks in [`Gruntfile.js`](https://github.com/zackphilipps/scratch-theme/blob/master/_assets/grunt/Gruntfile.js), or the `javascript` task in [`gulpfile.js`](https://github.com/zackphilipps/scratch-theme/blob/master/_assets/gulp/gulpfile.js) and have a look at the structure.
+View the `concat` and `uglify` tasks in [`Gruntfile.js`](https://github.com/zackphilipps/scratch-theme/blob/master/assets/grunt/Gruntfile.js), or the `javascript` task in [`gulpfile.js`](https://github.com/zackphilipps/scratch-theme/blob/master/assets/gulp/gulpfile.js) and have a look at the structure.
 
 View [`functions.php`](https://github.com/zackphilipps/scratch-theme/blob/master/functions.php) to see how `main.js` and [Modernizr](http://modernizr.com/) are enqueued.
diff --git a/_assets/js/acf-google-maps.js → assets/js/acf-google-maps.js b/_assets/js/acf-google-maps.js → assets/js/acf-google-maps.js
diff --git a/assets/js/compiled/main.min.js b/assets/js/compiled/main.min.js