From 68adeae84b8a319c75e290cabb58d466d0b89c59 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Tue, 16 Aug 2016 19:47:29 -0400
Subject: [PATCH] Move the gulp modernizr task to just above the watch task and
 fix the dashboard includes

---
 gulpfile.js                          | 14 +++++++-------
 resources/assets/sass/dashboard.scss |  6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index b96b95b..9256225 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -114,6 +114,13 @@ gulp.task("js-dashboard-libs", function() {
     return processJavaScript("lib-dashboard", jsDashboardLibs, false);
 });
 
+// gulp task to copy fonts
+gulp.task("fonts", function() {
+    return gulp.src(fontPaths)
+        .pipe(gPlumber(plumberError))
+        .pipe(gulp.dest("public/fonts/"));
+});
+
 // gulp task for modernizr
 gulp.task("modernizr", function() {
     const modernizr = gulp.src([ "public/js/lib.js", "public/js/app.js", "public/css/app.css" ])
@@ -131,13 +138,6 @@ gulp.task("modernizr", function() {
     return modernizr.pipe(gulp.dest("public/js/"));
 });
 
-// gulp task to copy fonts
-gulp.task("fonts", function() {
-    return gulp.src(fontPaths)
-        .pipe(gPlumber(plumberError))
-        .pipe(gulp.dest("public/fonts/"));
-});
-
 // gulp watch task
 gulp.task("watch", function() {
     const gLiveReload = require("gulp-livereload");
diff --git a/resources/assets/sass/dashboard.scss b/resources/assets/sass/dashboard.scss
index e36762f..936da57 100644
--- a/resources/assets/sass/dashboard.scss
+++ b/resources/assets/sass/dashboard.scss
@@ -1,11 +1,13 @@
 // Libraries
+
 @import "bootstrap-sass/assets/stylesheets/_bootstrap.scss";
 @import "fontawesome/scss/font-awesome.scss";
-@import "awesome-bootstrap-checkbox/awesome-bootstrap-checkbox";
-@import "jquery-ui/themes/base/datepicker";
+@import "awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.scss";
+@import "datetimepicker/jquery.datetimepicker";
 @import "simplemde/dist/simplemde.min";
 @import "SpinKit/css/spinners/11-folding-cube";
 
+
 // Core
 @import "_var";
 @import "_fonts";