Merge pull request #10 from HobbitCodes/master

Amends to the gulpfile & Removing duplicate files

Author: HobbitCodes

.gitignore

@@ -1 +1,2 @@
 /vendor/
+node_modules/*

assets/scss/components/_footer.scss

@@ -0,0 +1,3 @@
+.site-footer {
+
+}

assets/scss/components/_header.scss

@@ -0,0 +1,3 @@
+.site-header {
+
+}

assets/scss/elements/_elements.scss

@@ -0,0 +1,71 @@
+h1, h2, h3, h4, a {
+    margin: 0;
+}
+
+a h1, h1 {
+    font-size: 2.5rem;
+    line-height: 2.91rem;
+    text-decoration: none;
+}
+
+a h2, h2 {
+    font-size: 1.875rem;
+    line-height: 2.29rem;
+    margin-bottom: .4rem;
+    text-decoration: none;
+}
+
+a h3, h3 {
+    font-size: 1.166rem;
+    line-height: 1.458rem;
+    text-decoration: none;
+}
+
+a h4, h4 {
+    font-size: 1rem;
+    line-height: 1.25rem;
+    text-decoration: none;
+}
+
+a p, p {
+    font-size: 1rem;
+    line-height: 1.458rem;
+    margin: 0;
+    margin-bottom: 2.083rem;
+    text-decoration: none;
+
+    &:last-of-type {
+        margin-bottom: 0;
+    }
+}
+
+strong {
+    font-size: 1rem;
+    line-height: 1.458rem;
+    text-decoration: none;
+}
+
+a {
+    transition: color .5s;
+
+    &:hover {
+
+    }
+}
+
+img {
+    height: auto;
+    max-width: 100%;
+}
+
+.content-section {
+    ol,
+    ul {
+        padding-left: 1rem;
+
+        li {
+            margin-bottom: 1.25rem;
+            padding-left: $gutter-width;
+        }
+    }
+}

assets/scss/main.scss

@@ -0,0 +1,13 @@
+$font-path: './assets/fonts' !default;
+$image-path: './images' !default;
+
+@import 'settings/variables',
+        'settings/typography';
+
+@import 'tools/grid',
+        'tools/mixins',
+        'tools/utilities';
+
+// Media queries go here
+@import 'tools/mediaqueries/grid-mediaqueries',
+        'tools/mediaqueries/utilities-mediaqueries';

assets/scss/objects/_wrappers.scss

@@ -0,0 +1,29 @@
+.site-content-contain {
+    margin-top: $header-height;
+    position: relative;
+    width: calc(100% - #{$header-height});
+}
+
+.content-section {
+    padding-left: 6.66rem;
+    padding-right: 6.66rem;
+    transition: padding .3s;
+}
+
+section.content-section {
+    padding-bottom: $section-margin;
+    padding-top: $section-margin;
+
+    &--reduced-padding {
+        padding-bottom: 3.33rem;
+        padding-top: 3.33rem;
+    }
+
+    &--border-bottom {
+        border-bottom: 2px solid $stratos;
+    }
+
+    &--no-padding {
+        padding-top: 0;
+    }
+}

classes/ACF/Blocks/Testimonials.php

@@ -44,6 +44,6 @@ public static function renderBlock($block): void
 
         $vars['fields']['avatar'] = new \Timber\Image($vars['fields']['avatar']);
 
-        Timber::render( get_stylesheet_directory() . '/classes/ACF/Blocks/views/content-testimonials.twig', $vars );
+        Timber::render( get_stylesheet_directory() . '/classes/ACF/Blocks/views/testimonials.twig', $vars );
     }
 }

classes/ACF/Blocks/views/content-testimonials.twig classes/ACF/Blocks/views/testimonials.twig

@@ -11,4 +11,4 @@
         <p class="testimonial__content">{{ fields.testimonial }}</p>
         <span class="testimonial__author">{{ fields.author }}</span>
     </div>
-</section>
+</section>

controllers/Wordpress/PageController.php

@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Class PageController
+ *
+ * Handles requests that go through the page.php file
+ */
+class PageController
+{
+
+}

gulpfile.js

@@ -16,8 +16,8 @@ var gulp = require('gulp'),
     imagemin = require('gulp-imagemin'),
     paths = {
         input_scss: [
-            './wp-content/themes/erebus/assets/scss/style.scss',
-            './wp-content/themes/erebus/assets/scss/editor-style.scss'
+            './assets/scss/style.scss',
+            './assets/scss/editor-style.scss'
         ]
     };
 
@@ -34,7 +34,7 @@ gulp.task('scss', function () {
         }))
         .pipe(cleanCSS())
         .pipe(rename({
-            dirname: './wp-content/themes/erebus/'
+            dirname: './'
         }))
         .pipe(sourcemaps.write('./'))
         .pipe(gulp.dest('./'))
@@ -43,16 +43,16 @@ gulp.task('scss', function () {
 });
 
 gulp.task('images', function () {
-    gulp.src('./wp-content/themes/erebus/assets/images/*')
+    gulp.src('./assets/images/*')
         .pipe(imagemin())
-        .pipe(gulp.dest('./wp-content/themes/erebus/images/')
+        .pipe(gulp.dest('./assets/images/')
         );
 });
 
 gulp.task('js', function () {
     // set up the browserify instance on a task basis
     var b = browserify({
-        entries: './wp-content/themes/erebus/assets/js/main.js',
+        entries: './assets/js/main.js',
         debug: true
     });
 
@@ -63,7 +63,7 @@ gulp.task('js', function () {
         // Add transformation tasks to the pipeline here.
         .pipe(uglify())
         .pipe(rename({
-            dirname: './wp-content/themes/erebus/'
+            dirname: './'
         }))
         .pipe(sourcemaps.write('./'))
         .pipe(gulp.dest('./'));
@@ -72,6 +72,6 @@ gulp.task('js', function () {
 //Watch task
 gulp.task('default', ['scss', 'js'], function () {
     livereload.listen();
-    gulp.watch('./wp-content/themes/erebus/assets/scss/**/*.scss', ['scss']);
-    gulp.watch('./wp-content/themes/erebus/assets/js/**/*.js', ['js']);
+    gulp.watch('./assets/scss/**/*.scss', ['scss']);
+    gulp.watch('./assets/js/**/*.js', ['js']);
 });