Skip to content

Commit

Permalink
update dependencies, gulp 4 update, and update copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtmiller committed Feb 1, 2019
1 parent 7528e64 commit a1e7bce
Show file tree
Hide file tree
Showing 1,589 changed files with 30,570 additions and 28,048 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
sudo: false
language: node_js
git:
depth: 3
node_js:
- "node"
install: npm install
Expand All @@ -9,3 +10,5 @@ script:
cache:
directories:
- node_modules
notifications:
email: false
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2018 Blackrock Digital LLC
Copyright (c) 2013-2019 Blackrock Digital LLC

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 1 addition & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ After installation, run `npm install` and then run `gulp dev` which will open up

You must have npm and Gulp installed globally on your machine in order to use these features.

## Troubleshooting and Help

Start Bootstrap has a public Slack channel which is a great place to ask questions about this template and all things related to Start Bootstrap.

**[Click here to join the Slack channel!](https://startbootstrap-slack.herokuapp.com/)**

## Bugs and Issues

Have a bug or an issue with this template? [Open a new issue](https://github.com/BlackrockDigital/startbootstrap-resume/issues) here on GitHub or leave a comment on the [template overview page at Start Bootstrap](http://startbootstrap.com/template-overviews/resume/).
Expand All @@ -71,4 +65,4 @@ Start Bootstrap is based on the [Bootstrap](http://getbootstrap.com/) framework

## Copyright and License

Copyright 2013-2018 Blackrock Digital LLC. Code released under the [MIT](https://github.com/BlackrockDigital/startbootstrap-resume/blob/gh-pages/LICENSE) license.
Copyright 2013-2019 Blackrock Digital LLC. Code released under the [MIT](https://github.com/BlackrockDigital/startbootstrap-resume/blob/gh-pages/LICENSE) license.
4 changes: 2 additions & 2 deletions css/resume.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Start Bootstrap - Resume v5.0.2 (https://startbootstrap.com/template-overviews/resume)
* Copyright 2013-2018 Start Bootstrap
* Start Bootstrap - Resume v5.0.3 (https://startbootstrap.com/template-overviews/resume)
* Copyright 2013-2019 Start Bootstrap
* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-resume/blob/master/LICENSE)
*/

Expand Down
4 changes: 2 additions & 2 deletions css/resume.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

125 changes: 67 additions & 58 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
var gulp = require('gulp');
var sass = require('gulp-sass');
var header = require('gulp-header');
var cleanCSS = require('gulp-clean-css');
var rename = require("gulp-rename");
var uglify = require('gulp-uglify');
var autoprefixer = require('gulp-autoprefixer');
var pkg = require('./package.json');
var browserSync = require('browser-sync').create();
// Load plugins
const autoprefixer = require("gulp-autoprefixer");
const browsersync = require("browser-sync").create();
const cleanCSS = require("gulp-clean-css");
const gulp = require("gulp");
const header = require("gulp-header");
const plumber = require("gulp-plumber");
const rename = require("gulp-rename");
const sass = require("gulp-sass");
const uglify = require("gulp-uglify");
const pkg = require('./package.json');

// Set the banner content
var banner = ['/*!\n',
const banner = ['/*!\n',
' * Start Bootstrap - <%= pkg.title %> v<%= pkg.version %> (<%= pkg.homepage %>)\n',
' * Copyright 2013-' + (new Date()).getFullYear(), ' <%= pkg.author %>\n',
' * Licensed under <%= pkg.license %> (https://github.com/BlackrockDigital/<%= pkg.name %>/blob/master/LICENSE)\n',
Expand All @@ -18,7 +20,7 @@ var banner = ['/*!\n',
].join('');

// Copy third party libraries from /node_modules into /vendor
gulp.task('vendor', function() {
gulp.task('vendor', function(cb) {

// Bootstrap
gulp.src([
Expand Down Expand Up @@ -47,76 +49,83 @@ gulp.task('vendor', function() {
])
.pipe(gulp.dest('./vendor/jquery-easing'))

cb();

});

// Compile SCSS
gulp.task('css:compile', function() {
return gulp.src('./scss/**/*.scss')
.pipe(sass.sync({
outputStyle: 'expanded'
}).on('error', sass.logError))
// CSS task
function css() {
return gulp
.src("./scss/*.scss")
.pipe(plumber())
.pipe(sass({
outputStyle: "expanded"
}))
.on("error", sass.logError)
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(header(banner, {
pkg: pkg
}))
.pipe(gulp.dest('./css'))
});

// Minify CSS
gulp.task('css:minify', ['css:compile'], function() {
return gulp.src([
'./css/*.css',
'!./css/*.min.css'
])
.pipe(cleanCSS())
.pipe(gulp.dest("./css"))
.pipe(rename({
suffix: '.min'
suffix: ".min"
}))
.pipe(gulp.dest('./css'))
.pipe(browserSync.stream());
});

// CSS
gulp.task('css', ['css:compile', 'css:minify']);
.pipe(cleanCSS())
.pipe(gulp.dest("./css"))
.pipe(browsersync.stream());
}

// Minify JavaScript
gulp.task('js:minify', function() {
return gulp.src([
// JS task
function js() {
return gulp
.src([
'./js/*.js',
'!./js/*.min.js'
'!./js/*.min.js',
'!./js/contact_me.js',
'!./js/jqBootstrapValidation.js'
])
.pipe(uglify())
.pipe(rename({
suffix: '.min'
}))
.pipe(header(banner, {
pkg: pkg
}))
.pipe(rename({
suffix: '.min'
}))
.pipe(gulp.dest('./js'))
.pipe(browserSync.stream());
});

// JS
gulp.task('js', ['js:minify']);
.pipe(browsersync.stream());
}

// Default task
gulp.task('default', ['css', 'js', 'vendor']);
// Tasks
gulp.task("css", css);
gulp.task("js", js);

// Configure the browserSync task
gulp.task('browserSync', function() {
browserSync.init({
// BrowserSync
function browserSync(done) {
browsersync.init({
server: {
baseDir: "./"
}
});
});
done();
}

// Dev task
gulp.task('dev', ['css', 'js', 'browserSync'], function() {
gulp.watch('./scss/*.scss', ['css']);
gulp.watch('./js/*.js', ['js']);
gulp.watch('./*.html', browserSync.reload);
});
// BrowserSync Reload
function browserSyncReload(done) {
browsersync.reload();
done();
}

// Watch files
function watchFiles() {
gulp.watch("./scss/**/*", css);
gulp.watch(["./js/**/*.js", "!./js/*.min.js"], js);
gulp.watch("./**/*.html", browserSyncReload);
}

gulp.task("default", gulp.parallel('vendor', css, js));

// dev task
gulp.task("dev", gulp.parallel(watchFiles, browserSync));
Loading

0 comments on commit a1e7bce

Please sign in to comment.