diff --git a/.travis.yml b/.travis.yml index 18f48b1..9662ddf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ -sudo: false language: node_js +git: + depth: 3 node_js: - "node" install: npm install @@ -9,3 +10,5 @@ script: cache: directories: - node_modules +notifications: + email: false diff --git a/LICENSE b/LICENSE index 77afa5b..9478164 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/README.md b/README.md index 1ceeb11..8fd54af 100644 --- a/README.md +++ b/README.md @@ -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/). @@ -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. diff --git a/css/resume.css b/css/resume.css index ae77026..94c2786 100644 --- a/css/resume.css +++ b/css/resume.css @@ -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) */ diff --git a/css/resume.min.css b/css/resume.min.css index c832a68..fd849e6 100644 --- a/css/resume.min.css +++ b/css/resume.min.css @@ -1,5 +1,5 @@ /*! - * 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) */body{font-family:Muli,-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol','Noto Color Emoji';padding-top:54px;color:#868e96}@media (min-width:992px){body{padding-top:0;padding-left:17rem}}h1,h2,h3,h4,h5,h6{font-family:'Saira Extra Condensed',-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol','Noto Color Emoji';font-weight:700;text-transform:uppercase;color:#343a40}h1{font-size:6rem;line-height:5.5rem}h2{font-size:3.5rem}h3{font-size:2rem}p.lead{font-size:1.15rem;font-weight:400}.subheading{text-transform:uppercase;font-weight:500;font-family:'Saira Extra Condensed',-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol','Noto Color Emoji';font-size:1.5rem}.social-icons a{display:inline-block;height:3.5rem;width:3.5rem;background-color:#495057;color:#fff!important;border-radius:100%;text-align:center;font-size:1.5rem;line-height:3.5rem;margin-right:1rem}.social-icons a:last-child{margin-right:0}.social-icons a:hover{background-color:#bd5d38}.dev-icons{font-size:3rem}.dev-icons .list-inline-item i:hover{color:#bd5d38}#sideNav .navbar-nav .nav-item .nav-link{font-weight:800;letter-spacing:.05rem;text-transform:uppercase}#sideNav .navbar-toggler:focus{outline-color:#d48a6e}@media (min-width:992px){#sideNav{text-align:center;position:fixed;top:0;left:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:17rem;height:100vh}#sideNav .navbar-brand{display:-webkit-box;display:-ms-flexbox;display:flex;margin:auto auto 0;padding:.5rem}#sideNav .navbar-brand .img-profile{max-width:10rem;max-height:10rem;border:.5rem solid rgba(255,255,255,.2)}#sideNav .navbar-collapse{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-flex:0;-ms-flex-positive:0;flex-grow:0;width:100%;margin-bottom:auto}#sideNav .navbar-collapse .navbar-nav{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%}#sideNav .navbar-collapse .navbar-nav .nav-item{display:block}#sideNav .navbar-collapse .navbar-nav .nav-item .nav-link{display:block}}section.resume-section{padding-top:5rem!important;padding-bottom:5rem!important;max-width:75rem}section.resume-section .resume-item .resume-date{min-width:none}@media (min-width:768px){section.resume-section{min-height:100vh}section.resume-section .resume-item .resume-date{min-width:18rem}}@media (min-width:992px){section.resume-section{padding-top:3rem!important;padding-bottom:3rem!important}}.bg-primary{background-color:#bd5d38!important}.text-primary{color:#bd5d38!important}a{color:#bd5d38}a:active,a:focus,a:hover{color:#824027} \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 61b63fc..0c2f6e2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -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', @@ -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([ @@ -47,14 +49,19 @@ 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 @@ -62,61 +69,63 @@ gulp.task('css:compile', function() { .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)); diff --git a/index.html b/index.html index 33912b8..ee33cf2 100644 --- a/index.html +++ b/index.html @@ -1,300 +1,300 @@ -
- - - - - - -