diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index c78023c..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/assets/sass/vendor/simple-grid b/assets/sass/vendor/simple-grid index 4cef1bf..e87c4f6 160000 --- a/assets/sass/vendor/simple-grid +++ b/assets/sass/vendor/simple-grid @@ -1 +1 @@ -Subproject commit 4cef1bf7cb635806cb07fc30cbb34ae211881570 +Subproject commit e87c4f6ee56bb7223a1cb56698cec4d0fdabbd29 diff --git a/functions.php b/functions.php index 19fd317..6e81d7d 100644 --- a/functions.php +++ b/functions.php @@ -69,7 +69,7 @@ function barebones_scripts() * For IE8 to play nice, you'll need to include your CSS here, for example: */ // wp_enqueue_style( 'fonts', '//fonts.googleapis.com/css?family=Font+Family' ); - // wp_enqueue_style( 'icons', '//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css' ); + // wp_enqueue_style( 'icons', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.0/css/font-awesome.min.css' ); wp_deregister_script( 'jquery' ); wp_register_script( 'jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js', false, '1.11.3', true ); wp_enqueue_script( 'jquery' ); diff --git a/gulpfile.js b/gulpfile.js index 71fa62e..b6befe6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,5 @@ -// config - desktop notifications -process.env.DISABLE_NOTIFIER = false; +// Disable notifications +// +process.env.DISABLE_NOTIFIER = false; var gulp = require('gulp'); var gulpImagemin = require('gulp-imagemin'); @@ -10,17 +10,17 @@ elixir.config.assetsPath = 'assets'; // Imagemin var Task = elixir.Task; -elixir.extend('imagemin', function(config) { +elixir.extend('imagemin', function(src, dest) { new Task('imagemin', function() { - return gulp.src(elixir.config.assetsPath + '/images/**/*') - .pipe(gulpImagemin(config)) - .pipe(gulp.dest('./images')); - }).watch(elixir.config.assetsPath + '/images/**/*'); + return gulp.src(elixir.config.assetsPath + src) + .pipe(gulpImagemin()) + .pipe(gulp.dest(dest)); + }).watch(elixir.config.assetsPath + src); }); // Run elixir tasks elixir(function(mix) { mix.sass('barebones.scss', 'style.css') .scripts(['script.js'], 'js/script.min.js') - .imagemin(); + .imagemin('/img/**/*', './img'); }); diff --git a/header.php b/header.php index f0b8c86..264d8f6 100755 --- a/header.php +++ b/header.php @@ -1,4 +1,6 @@ + + > @@ -11,8 +13,8 @@