Skip to content

Commit

Permalink
updates bower package
Browse files Browse the repository at this point in the history
NEW to 1.1.2
- adds browser-sync gulp configuration
- improves base variable settings
- package.json updates
- updates packages that are out of date.. more to come
  • Loading branch information
WhatsNewSaes committed Feb 21, 2016
1 parent ecf8348 commit f953fe0
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 25 deletions.
15 changes: 7 additions & 8 deletions _input/sass/components/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

// Uncommenting the settings below will overwrite the individual variable settings defined on each .scss file within the /components folder. These are common settings that will help you theme your template quickly and efficiently. To see a full list of variable settins please view each individual .scss file located in the /components folder

// ++++++++++++++++++++++++++++++++
// Base
// ++++++++++++++++++++++++++++++++
// $body-bg:#000000;
// $hr-color: #d9d9d9;
// $template-label: #FFFFFF;

// ++++++++++++++++++++++++++++++++
// GRID
Expand All @@ -21,7 +27,7 @@
// $link-color:#2ba6cb;
// $font-family:"Helvetica", "Arial", sans-serif;
// $p-font-size:14px;
// $p-lead-font-size:38px;
// $p-lead-font-size:18px;


// ++++++++++++++++++++++++++++++++
Expand Down Expand Up @@ -50,10 +56,3 @@
//
// $success-bg-color:#5da423;
// $alert-bg-color:#c60f13;


// ++++++++++++++++++++++++++++++++
// MISC
// ++++++++++++++++++++++++++++++++
// $hr-color: #d9d9d9;
// $template-label: #FFFFFF;
2 changes: 2 additions & 0 deletions _input/sass/components/base.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
$hr-color: #d9d9d9 !default;
$template-label: white !default;
$body-bg:#ffffff !default;

/* Client-specific Styles & Reset */

Expand All @@ -10,6 +11,7 @@ body {
-ms-text-size-adjust: 100%;
margin: 0;
padding: 0;
background-color: $body-bg;
}

.ExternalClass {
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "email-slayer",
"version": "1.0.0",
"version": "1.1.2",
"homepage": "https://github.com/whatsnewsaes/email-slayer",
"authors": [
"WhatsNewSaes <seth@coelen.co>"
Expand Down
50 changes: 44 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
var gulp = require('gulp'),
del = require('del'),
browserSync = require('browser-sync').create(),
inlineCss = require('gulp-inline-css'),
sass = require('gulp-sass'),
smoosher = require('gulp-smoosher'),
plumber = require('gulp-plumber'),
gutil = require('gulp-util'),
clean = require ('gulp-clean'),
runSequence = require('run-sequence');


// lets gulp throw errors during watch without stopping
var onError = function (err) {
gutil.beep();
Expand All @@ -23,10 +25,16 @@ gulp.task('sass', function () {
errorHandler: onError
}))
.pipe(sass())
.pipe(browserSync.reload({
stream: true
}))
.pipe(gulp.dest('css'));

});




//------------------------
// Watch Gulp Task
//------------------------
Expand Down Expand Up @@ -73,20 +81,50 @@ gulp.task('inlineCss', function() {
//------------------------
// Clean Gulp Task
//------------------------
gulp.task('clean', function(){
return gulp.src('tmp', {read:false})
.pipe(clean());

// deletes existing folders in output which will be replaced by inlined versions of _input files
gulp.task('clean:output', function() {
return del([
'_output/**/*'
]);
});

// delets tmp folder that is created to add media queries
gulp.task('clean:tmp', function() {
return del([
'tmp'
]);
});

//------------------------
// Browsersync Gulp Task
//------------------------


gulp.task('browser-sync', function() {
browserSync.init({
server: {
baseDir: "./"
}
});

// gulp.watch("_input/sass/.scss", ['sass']);
gulp.watch("_input/*.html").on('change', browserSync.reload);

});



//------------------------
// Task Config
//------------------------
gulp.task('default', ['sass', 'watch']);

//default gulp task.
gulp.task('default', ['sass', 'watch', 'browser-sync']);

// Pulls in media queries, css, then deletes tmp folder
gulp.task('build', function(callback) {
runSequence('sass','smoosher','inlineCss', 'clean',
runSequence('clean:output', 'sass','smoosher','inlineCss', 'clean:tmp',
callback);
});

33 changes: 23 additions & 10 deletions package.json
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,15 +1,28 @@
{
"author": "Seth Coelen",
"license": "MIT",
"name": "Email-Slayer",
"version": "1.0.0",
"version": "1.1.2",
"description": "Email Slayer makes building responsive emails easy and extremely efficient",
"devDependencies": {
"gulp": "~3.8.11",
"gulp-inline-css": "~2.0.0",
"gulp-sass": "~1.3.3",
"gulp-smoosher": "0.0.7",
"gulp-plumber": "~1.0.0",
"gulp-util": "~3.0.4",
"gulp-clean": "~0.3.1",
"run-sequence": "~1.0.2"
}
"browser-sync": "^2.11.1",
"del": "^2.2.0",
"gulp": "^3.9.1",
"gulp-inline-css": "^3.0.0",
"gulp-plumber": "^1.1.0",
"gulp-sass": "^2.2.0",
"gulp-smoosher": "0.0.9",
"gulp-util": "^3.0.7",
"run-sequence": "^1.1.5"
},
"repository": {
"type": "git",
"url": "https://github.com/whatsnewsaes/email-slayer"
},
"keywords": [
"gulp",
"sass",
"zurb ink",
"email"
]
}

0 comments on commit f953fe0

Please sign in to comment.