From f59fb3a720b1840e2e9534c7f0f7c4b47247ca0e Mon Sep 17 00:00:00 2001 From: Pedro Reis Date: Mon, 25 Apr 2016 17:39:37 +0100 Subject: [PATCH 1/9] Added conditional tag classes --- header.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/header.php b/header.php index f0b8c86..378e12b 100755 --- a/header.php +++ b/header.php @@ -1,4 +1,6 @@ + + > From 5bb344dba906851071633f109fd64dd8c09ac24d Mon Sep 17 00:00:00 2001 From: Pedro Reis Date: Wed, 11 May 2016 16:40:21 +0100 Subject: [PATCH 2/9] Updated FontAwesome version --- functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' ); From 1d92e5f628637ffb89b65ed3a3671810746ae233 Mon Sep 17 00:00:00 2001 From: Pedro Reis Date: Tue, 17 May 2016 12:01:20 +0100 Subject: [PATCH 3/9] Pulled down update to simple-grid --- assets/sass/vendor/simple-grid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 83547518cac72e4f89774556e1da286fa1d8623d Mon Sep 17 00:00:00 2001 From: Lukas Juhas Date: Tue, 17 May 2016 12:15:45 +0100 Subject: [PATCH 4/9] delete rubbish --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index c78023c164d54e846591c276ce5776ae90bdf04e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyH3ME5S$AUibRu=(&7V%QqWt$bciOR2ggx(1zWM*`x|Nb8D{sEC?>8ELc7x4 z?CtC9k$mR`5EgAQ2c`ff9D+fV0TJ_{Yh=Nv#2_`QCcka#X2YNuKCVBn)NA%)&|WObymzgqTiyVsWWq7cr(I zSo0BV=kMkv=lC|8Mxo3^w`w6kj<5&cHuoAdItRw%|+I z-FozTa@Qst4;&&A*NH-*-unsQLe7zMbw+<8I^$BqE}~QsyQUNUM?eYj$r< Date: Tue, 17 May 2016 12:50:15 +0100 Subject: [PATCH 5/9] Reenable notifications --- gulpfile.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 88216df..57c3e0d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,6 +1,3 @@ -// config - desktop notifications -process.env.DISABLE_NOTIFIER = false; - var gulp = require('gulp'); var gulpImagemin = require('gulp-imagemin'); var elixir = require('laravel-elixir'); From 1a70bbde6e320f9f60c831ba334d1311af1bfa89 Mon Sep 17 00:00:00 2001 From: Pedro Reis Date: Tue, 17 May 2016 12:52:00 +0100 Subject: [PATCH 6/9] Update gulpfile.js --- gulpfile.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gulpfile.js b/gulpfile.js index 57c3e0d..a70faa6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,3 +1,6 @@ +// Disable notifications +// +process.env.DISABLE_NOTIFIER = false; + var gulp = require('gulp'); var gulpImagemin = require('gulp-imagemin'); var elixir = require('laravel-elixir'); From 8c4c5efbfb574ab44b002ae9151bc28f0e06eb40 Mon Sep 17 00:00:00 2001 From: Pedro Reis Date: Fri, 24 Jun 2016 10:03:02 +0100 Subject: [PATCH 7/9] Updated HTML 5 Shiv link --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 378e12b..747f06e 100755 --- a/header.php +++ b/header.php @@ -14,7 +14,7 @@ From 800b21301616dfca32d509188e9756ae8c41198d Mon Sep 17 00:00:00 2001 From: Pedro Reis Date: Fri, 24 Jun 2016 10:08:13 +0100 Subject: [PATCH 8/9] Updated css3 media queries link --- header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/header.php b/header.php index 747f06e..264d8f6 100755 --- a/header.php +++ b/header.php @@ -13,7 +13,7 @@ From 985687718a0094a67468fee775886c14c275a368 Mon Sep 17 00:00:00 2001 From: Pedro Reis Date: Fri, 24 Jun 2016 12:27:53 +0100 Subject: [PATCH 9/9] Update gulpfile.js --- gulpfile.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7951bba..b6befe6 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -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'); });