Merge branch 'wbagdon-master'

css/_config.scss.sample

@@ -14,4 +14,4 @@
  *
  * @type {Boolean}
  */
-$small-main-feed-image: false;
+$small-main-feed-image: true;

gulpfile.js

@@ -3,22 +3,24 @@ var $ = require('gulp-load-plugins') ();
 var pkg = require('./package.json');
 
 var gulp = require('gulp');
+var del = require('del');
+
 $.runSequence = require('run-sequence');
 $.streamqueue = require('streamqueue');
 
 gulp.task('build', function() {
   $.runSequence(
-    'backupConfig',
+    'backupCustomConfig',
     'setDefaultConfig',
     'styles',
-    'setTempConfig'
+    'resetCustomConfig',
+    'cleanupTmp'
   );
 });
 
-gulp.task('backupConfig', function() {
+gulp.task('backupCustomConfig', function() {
   // move the custom config
   gulp.src('./css/_config.scss')
-  .pipe($.clean())
   .pipe($.rename('_config.scss.tmp'))
   .pipe(gulp.dest('./css/'));
 });
@@ -30,14 +32,21 @@ gulp.task('setDefaultConfig', function() {
   .pipe(gulp.dest('./css/'));
 });
 
-gulp.task('setTempConfig', function() {
+gulp.task('resetCustomConfig', function() {
   // put the custom config back
   return gulp.src('./css/_config.scss.tmp')
-  .pipe($.clean())
   .pipe($.rename('_config.scss'))
   .pipe(gulp.dest('./css/'));
 });
 
+gulp.task('cleanupTmp', function() {
+  return del('./css/_config.scss.tmp')
+});
+
+gulp.task('deleteCustomConfig', function() {
+  return del('./css/_config.scss')
+});
+
 var sass = function () {
   return gulp.src('./css/main.scss')
   .pipe($.sass({ compress: true, sourceMap: true }))

package.json

@@ -1,7 +1,7 @@
 {
   "name": "clean-greader",
-  "version": "2.0.0",
-  "ttrssVersion": "16.1",
+  "version": "2.1.0",
+  "ttrssVersion": "16.3",
   "description": "clean-greader - a Google Reader inspired Tiny Tiny RSS theme",
   "main": "css/main.css",
   "author": "Sven Flickinger <hc4e2k@gmail.com>",
@@ -10,16 +10,16 @@
     "url": "https://github.com/naeramarth7/clean-greader.git"
   },
   "devDependencies": {
+    "del": "^2.2.0",
     "gulp": "^3.9.1",
-    "gulp-clean": "^0.2.4",
     "gulp-cssmin": "^0.1.7",
     "gulp-header": "^1.7.1",
-    "gulp-livereload": "^1.5.0",
-    "gulp-load-plugins": "^0.8.1",
+    "gulp-livereload": "^3.8.1",
+    "gulp-load-plugins": "^1.2.0",
     "gulp-rename": "^1.2.2",
     "gulp-sass": "^2.2.0",
-    "gulp-util": "^2.2.20",
+    "gulp-util": "^3.0.7",
     "run-sequence": "^1.1.5",
-    "streamqueue": "^0.1.3"
+    "streamqueue": "^1.1.1"
   }
 }