From 82ae6b051379c3c9889eec795e75abed625f68fd Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Thu, 29 Mar 2018 09:29:20 -0400 Subject: [PATCH] fixing gulp setup, adding new styles for interior pages and adding blog setup --- .gitignore | 1 + assets/css/glm-dev.css | 3 + assets/css/glm-dev.css.map | 1 + assets/js/glm-dev.js | 1 + functions.php | 6 +- glm-dev/scss/_body.scss | 11 + glm-dev/scss/glm-dev.scss | 1 + gulpfile.js | 14 +- home.php | 36 + index.php | 3 - package-lock.json | 6479 ++++++++++++++++++++++++++++++++++++ page.php | 4 +- 12 files changed, 6545 insertions(+), 15 deletions(-) create mode 100644 .gitignore create mode 100644 assets/css/glm-dev.css create mode 100644 assets/css/glm-dev.css.map create mode 100644 assets/js/glm-dev.js create mode 100644 glm-dev/scss/_body.scss create mode 100644 glm-dev/scss/glm-dev.scss create mode 100644 home.php create mode 100644 package-lock.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/assets/css/glm-dev.css b/assets/css/glm-dev.css new file mode 100644 index 0000000..a8e7693 --- /dev/null +++ b/assets/css/glm-dev.css @@ -0,0 +1,3 @@ +body #page #content .mid-content .interior-page-content{width:100%} + +/*# sourceMappingURL=glm-dev.css.map */ diff --git a/assets/css/glm-dev.css.map b/assets/css/glm-dev.css.map new file mode 100644 index 0000000..682053a --- /dev/null +++ b/assets/css/glm-dev.css.map @@ -0,0 +1 @@ +{"version":3,"file":"glm-dev.css","sources":["glm-dev.scss","_body.scss"],"sourcesContent":["@import 'body';\n","body{\n #page{\n #content{\n .mid-content{\n .interior-page-content{\n width: 100%;\n } \n }\n }\n }\n}"],"mappings":"ACAA,AAIgB,IAJZ,CACA,KAAK,CACD,QAAQ,CACJ,YAAY,CACR,sBAAsB,AAAA,CAClB,KAAK,CAAE,IAAK,CACf","names":[]} \ No newline at end of file diff --git a/assets/js/glm-dev.js b/assets/js/glm-dev.js new file mode 100644 index 0000000..1da16fe --- /dev/null +++ b/assets/js/glm-dev.js @@ -0,0 +1 @@ +jQuery(function(n){}); \ No newline at end of file diff --git a/functions.php b/functions.php index 7d726c6..35d3dab 100644 --- a/functions.php +++ b/functions.php @@ -167,7 +167,7 @@ function accesspress_parallax_scripts() { wp_enqueue_style( 'nivo-lightbox', get_template_directory_uri() . '/css/nivo-lightbox.css' ); wp_enqueue_style( 'animate', get_template_directory_uri() . '/css/animate.css' ); wp_enqueue_style( 'slick', get_template_directory_uri() . '/css/slick.css' ); - wp_enqueue_style('accesspress-parallax-woocommerce',get_template_directory_uri().'/woocommerce/ap-parallax-style.css'); + wp_enqueue_style('accesspress-parallax-woocommerce',get_template_directory_uri().'/woocommerce/ap-parallax-style.css'); wp_enqueue_style( 'accesspress-parallax-style', get_stylesheet_uri() ); wp_enqueue_style( 'accesspress-parallax-responsive', get_template_directory_uri() . '/css/responsive.css' ); @@ -185,7 +185,9 @@ function accesspress_parallax_scripts() { wp_enqueue_script( 'nivo-lightbox', get_template_directory_uri() . '/js/nivo-lightbox.min.js', array('jquery'), '1.2.0', true ); wp_enqueue_script( 'slick', get_template_directory_uri() . '/js/slick.js', array('jquery'), '1.8.0', true ); wp_enqueue_script( 'accesspress-parallax-custom', get_template_directory_uri() . '/js/custom.js', array('jquery'), '1.0', true ); - wp_localize_script( 'accesspress-parallax-custom', 'ap_params', $slider_parameters ); + wp_localize_script( 'accesspress-parallax-custom', 'ap_params', $slider_parameters ); + wp_enqueue_script( 'glm-dev', get_template_directory_uri() . '/assets/js/glm-dev.js', array(), '1.0.0', true ); + wp_enqueue_style( 'glm-style', get_template_directory_uri() . '/assets/css/glm-dev.css', false, "1.0.0" ); if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) { wp_enqueue_script( 'comment-reply' ); diff --git a/glm-dev/scss/_body.scss b/glm-dev/scss/_body.scss new file mode 100644 index 0000000..e46fa20 --- /dev/null +++ b/glm-dev/scss/_body.scss @@ -0,0 +1,11 @@ +body{ + #page{ + #content{ + .mid-content{ + .interior-page-content{ + width: 100%; + } + } + } + } +} \ No newline at end of file diff --git a/glm-dev/scss/glm-dev.scss b/glm-dev/scss/glm-dev.scss new file mode 100644 index 0000000..c98fe23 --- /dev/null +++ b/glm-dev/scss/glm-dev.scss @@ -0,0 +1 @@ +@import 'body'; diff --git a/gulpfile.js b/gulpfile.js index 8852833..eebce99 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -30,11 +30,11 @@ gulp.task('sass', function() { .pipe(maps.init()) .on('error', swallowError) .pipe(sass({ - includePaths: sassPaths , + // includePaths: sassPaths , outputStyle: 'compressed' })).on('error', swallowError) .pipe(maps.write('.')) - .pipe(gulp.dest('assets/stylesheets')); + .pipe(gulp.dest('assets/css')); }); gulp.task('lint', function (){ @@ -48,12 +48,12 @@ gulp.task("concat-uglify", function (){ return gulp.src(['glm-dev/js/**/*.js']) .pipe(concat('glm-dev.js')) .pipe(uglify()) - .pipe(gulp.dest('assets/javascript')); -}); -gulp.task('clean', function (){ - return gulp.src(['js/foundation.min.js', 'js/motion-ui.min.js', 'js/what-input.min.js','js/custom/dist.js' ,'js/app.js','css/app.css','css/app.css.map','js/transpiled/dist.js'], {read: false}) - .pipe(clean()); + .pipe(gulp.dest('assets/js')); }); +// gulp.task('clean', function (){ +// return gulp.src(['js/foundation.min.js', 'js/motion-ui.min.js', 'js/what-input.min.js','js/custom/dist.js' ,'js/app.js','css/app.css','css/app.css.map','js/transpiled/dist.js'], {read: false}) +// .pipe(clean()); +// }); gulp.task('watch', function () { gulp.watch('glm-dev/js/**/*.js',['concat-uglify', 'lint']); gulp.watch('glm-dev/scss/**/*.{scss,sass}', ['sass']); diff --git a/home.php b/home.php new file mode 100644 index 0000000..feb46ad --- /dev/null +++ b/home.php @@ -0,0 +1,36 @@ + + + +
+
+
+ + + + + + + + + + + + + + + + + + +
+
+ + +
+ + - -
-
+
- -
-- 2.17.1