Verified Commit 34484670 authored by David Haynes's avatar David Haynes 🙆

Rip out FA4 and replace with with the shiny FA5 Free

- need to factor 5 into the build still
parent 9735e216
......@@ -14,11 +14,6 @@ const connect = require('gulp-connect');
const src = './src'
const dest = './build'
// Move fonts to build/fonts
gulp.task('fonts', () => gulp.src('./node_modules/font-awesome/fonts/fontawesome-webfont.woff2').pipe(connect.reload())
.pipe(gulp.dest(dest + '/fonts/'))
);
// Move html to build/html
gulp.task('html', () => gulp.src(src + '/html/*.html').pipe(connect.reload())
.pipe(gulp.dest(dest))
......@@ -74,7 +69,7 @@ gulp.task('http', () => {
});
// Run all tasks
gulp.task('build', ['sass', 'html', 'img', 'js', 'fonts']);
gulp.task('build', ['sass', 'html', 'img', 'js']);
// By default, run all tasks and then rebuild on changes
gulp.task('default', ['http', 'build', 'watch']);
\ No newline at end of file
......@@ -6,9 +6,9 @@
"author": "Mason SRCT",
"license": "MIT",
"dependencies": {
"@fortawesome/fontawesome": "^1.0.0",
"autoprefixer": "^7.1.4",
"bootstrap": "4.0.0-beta.2",
"font-awesome": "^4.7.0",
"gulp-connect": "^5.0.0",
"gulp-imagemin": "^3.3.0",
"gulp-postcss": "^7.0.0",
......
......@@ -9,8 +9,6 @@
@import "_functions";
// Load in variable overwrites
@import '_variables';
// Load in FA 4
@import '../../node_modules/font-awesome/scss/font-awesome';
// Load in bootstrap 4
@import '../../node_modules/bootstrap/scss/bootstrap';
// Masonstrap custom mixins
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment