Cleanup build infrastructure

2 files changed, 10 insertions, 10 deletions

diff --git a/gulpfile.js b/gulpfile.js
index 5621ff5..f6eef2d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,13 +1,13 @@
 var gulp = require('gulp'),
 	changed = require('gulp-changed'),
-	pug = require('gulp-pug-3'),
 	minifyhtml = require('gulp-minify-html'),
 	notify = require('gulp-notify'),
+	pug = require('gulp-pug-3'),
 	sass = require('gulp-sass-next');
 
 var config = {
+	pugPath:  './resources/pug',
 	sassPath: './resources/sass',
-	pugPath:  './resources/pug'
 }
 
 function css() {
@@ -16,9 +16,7 @@ function css() {
 				outputStyle: 'compressed',
 				includePaths: [
 					'./resources/sass',
-					'./node_modules/bootstrap-sass/assets/stylesheets',
-					'./node_modules/@fortawesome/fontawesome-free/scss',
-					'./node_modules/academicons/css'
+					'./node_modules'
 				]
 			})
 			.on('error', notify.onError(function (error) {
@@ -61,8 +59,8 @@ function fonts() {
 }
 
 function watch() {
-	gulp.watch(config.sassPath + '/**/*.scss', css);
 	gulp.watch(config.pugPath + '/**/*.pug', html);
+	gulp.watch(config.sassPath + '/**/*.scss', css);
 }
 
 exports.css = css;
diff --git a/resources/sass/style.scss b/resources/sass/style.scss
index 70f23ff..7afe3b4 100644
--- a/resources/sass/style.scss
+++ b/resources/sass/style.scss
@@ -1,9 +1,11 @@
-@import "bootstrap";
+@import "bootstrap-sass/assets/stylesheets/bootstrap";
 
-@import "fontawesome";
-@import "brands";
+@import "@fortawesome/fontawesome-free/scss/fontawesome";
+@import "@fortawesome/fontawesome-free/scss/brands";
 
-@import "academicons";
+@import "academicons/css/academicons";
+
+@import "highlight.js/scss/default";
 
 @font-face {
     font-family: Hebrew;