Skip to content
This repository has been archived by the owner on Jun 1, 2019. It is now read-only.

Commit

Permalink
5.4.1 Release
Browse files Browse the repository at this point in the history
- Guplfile.js path vars
- UIkit quick-fix
  • Loading branch information
Zach Schnackel committed Sep 29, 2014
1 parent 8bde564 commit aa781d9
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 65 deletions.
2 changes: 1 addition & 1 deletion assets/css/build/app.css 100644 → 100755

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion assets/css/src/uikit/uikit.less
@@ -1,5 +1,4 @@
// Defaults
@import "bower_components/uikit/src/less/normalize.less";
@import "bower_components/uikit/src/less/base.less";

// Layout
Expand Down
141 changes: 79 additions & 62 deletions gulpfile.js
@@ -1,65 +1,82 @@
// Load plugins
var gulp = require('gulp'),
Combine = require('stream-combiner'),
jshint = require('gulp-jshint'),
csso = require('gulp-csso'),
less = require('gulp-less'),
autoprefixer = require('gulp-autoprefixer'),
uglify = require('gulp-uglify'),
notify = require('gulp-notify'),
newer = require('gulp-newer'),
size = require('gulp-size'),
concat = require('gulp-concat'),
rename = require('gulp-rename'),
filesize = require('gulp-size'),
livereload = require('gulp-livereload'),
duration = require('gulp-duration'),
pixrem = require('gulp-pixrem');
var gulp = require("gulp"),
Combine = require("stream-combiner"),
jshint = require("gulp-jshint"),
csso = require("gulp-csso"),
less = require("gulp-less"),
autoprefixer = require("gulp-autoprefixer"),
uglify = require("gulp-uglify"),
notify = require("gulp-notify"),
newer = require("gulp-newer"),
size = require("gulp-size"),
concat = require("gulp-concat"),
rename = require("gulp-rename"),
filesize = require("gulp-size"),
livereload = require("gulp-livereload"),
duration = require("gulp-duration"),
pixrem = require("gulp-pixrem");

var paths = {
"scripts": {
"src": "assets/js/src/**/*.js",
"build": "assets/js/build/",
"vendor": "!assets/js/src/vendor/**/*.js"
},
"styles": {
"src": "assets/css/src/**/*.less",
"build": "assets/css/build/"
},
"media": {
"src": "assets/media/"
},
"fonts": {
"build": "assets/fonts/"
}
};

// JS Hint
gulp.task('jshint', function() {
gulp.src('assets/js/src/*.js')
gulp.task("jshint", function() {
gulp.src([paths.scripts.src, paths.scripts.vendor])
.pipe(jshint({
'boss': true,
'sub': true,
'evil': true,
'browser': true,
'multistr': true,
'globals': {
'module': false,
'require': true
"boss": true,
"sub": true,
"evil": true,
"browser": true,
"multistr": true,
"globals": {
"module": false,
"require": true
}
}))
.pipe(jshint.reporter('jshint-stylish'))
.pipe(duration('hinting files'))
.pipe(notify({ message: 'JS Hint task complete' }));
.pipe(jshint.reporter("jshint-stylish"))
.pipe(duration("hinting files"))
.pipe(notify({ message: "JS Hint task complete" }));
});

// Copy
gulp.task('copy', function() {
gulp.task("copy", function() {
// UIkit fonts
gulp.src('bower_components/uikit/dist/fonts/*')
.pipe(gulp.dest('assets/fonts/'));
gulp.src("bower_components/uikit/dist/fonts/*")
.pipe(gulp.dest(paths.fonts.build));
});

// Scripts
gulp.task('scripts', function() {
var jsBuildDir = 'assets/js/build/';
gulp.task("scripts", function() {

// IE
gulp.src([
'bower_components/selectivizr/selectivizr.js',
'bower_components/respond/dest/respond.min.js',
'assets/js/src/vendor/ecmascript-polyfill.js',
'assets/js/src/vendor/forEach-polyfill.js',
"bower_components/selectivizr/selectivizr.js",
"bower_components/respond/dest/respond.min.js",
"assets/js/src/vendor/ecmascript-polyfill.js",
"assets/js/src/vendor/forEach-polyfill.js",
])
.pipe(concat('ie.min.js'))
.pipe(concat("ie.min.js"))
.pipe(uglify())
.pipe(filesize({
title: 'IE Scripts:'
title: "IE Scripts:"
}))
.pipe(gulp.dest(jsBuildDir))
.pipe(notify({ message: 'IE scripts task complete' }));
.pipe(gulp.dest(paths.scripts.build))
.pipe(notify({ message: "IE scripts task complete" }));

// Main
gulp.src([
Expand Down Expand Up @@ -104,57 +121,57 @@ gulp.task('scripts', function() {
"bower_components/parsleyjs/dist/parsley.js",

// Project
'assets/js/src/_init.js'
"assets/js/src/_init.js"
])
.pipe(concat('scripts.min.js'))
.pipe(concat("scripts.min.js"))
.pipe(uglify())
.pipe(filesize({
title: 'Main Scripts:'
title: "Main Scripts:"
}))
.pipe(gulp.dest(jsBuildDir))
.pipe(duration('building main JS files'))
.pipe(notify({ message: 'Main scripts task complete' }));
.pipe(gulp.dest(paths.scripts.build))
.pipe(duration("building main JS files"))
.pipe(notify({ message: "Main scripts task complete" }));
});

// Styles
gulp.task('styles', function() {
gulp.task("styles", function() {
var combined = Combine(
gulp.src('assets/css/src/app.less'),
gulp.src("assets/css/src/app.less"),
less(),
autoprefixer('last 2 version', 'ie 9'),
autoprefixer("last 2 version", "ie 9"),
csso(),
pixrem('14px', {
pixrem("14px", {
replace: true
}),
filesize({
title: 'Styles:'
title: "Styles:"
}),
gulp.dest('assets/css/build/'),
duration('building styles'),
notify({ message: 'Styles task complete' })
gulp.dest(paths.styles.build),
duration("building styles"),
notify({ message: "Styles task complete" })
);

combined.on('error', function(err) {
combined.on("error", function(err) {
console.warn(err.message);
});

return combined;
});

// Default task
gulp.task('default', ['copy', 'styles', 'jshint', 'scripts']);
gulp.task("default", ["copy", "styles", "jshint", "scripts"]);

// Watch
gulp.task('watch', function() {
gulp.task("watch", function() {

gulp.watch('assets/css/src/**/*.less', ['styles']);
gulp.watch('assets/js/src/**/*.js', ['jshint', 'scripts']);
gulp.watch(paths.styles.src, ["styles"]);
gulp.watch(paths.scripts.src, ["jshint", "scripts"]);

// Create LiveReload server
var server = livereload();

// Watch files in patterns below, reload on change
gulp.watch(['assets/css/build/*', 'assets/js/build/*', '*.php']).on('change', function(file) {
gulp.watch([paths.styles.build, paths.scripts.build, "*.php"]).on("change", function(file) {
server.changed(file.path);
});

Expand Down
2 changes: 1 addition & 1 deletion style.css
Expand Up @@ -2,7 +2,7 @@
Theme Name: Basey
Theme URI: http://zslabs.com
Description: Base theme for development
Version: 5.4.0
Version: 5.4.1
Author: Zach Schnackel
Author URI: http://zslabs.com
*/

0 comments on commit aa781d9

Please sign in to comment.