kevin/hypothetical
1
0
Fork 0
mirror of https://github.com/prurigro/hypothetical.git synced 2024-09-19 10:14:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move the gulp modernizr task to just above the watch task and fix the dashboard includes

Browse source
This commit is contained in:
Kevin MacMartin 2016-08-16 19:47:29 -04:00
parent 5091f95475
commit 68adeae84b
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gulpfile.js
View file

@ -114,6 +114,13 @@ gulp.task("js-dashboard-libs", function() {
return processJavaScript("lib-dashboard", jsDashboardLibs, false); 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 for modernizr
gulp.task("modernizr", function() { gulp.task("modernizr", function() {
const modernizr = gulp.src([ "public/js/lib.js", "public/js/app.js", "public/css/app.css" ]) 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/")); 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 watch task
gulp.task("watch", function() { gulp.task("watch", function() {
const gLiveReload = require("gulp-livereload"); const gLiveReload = require("gulp-livereload");

6
resources/assets/sass/dashboard.scss
View file

@ -1,11 +1,13 @@
// Libraries // Libraries
@import "bootstrap-sass/assets/stylesheets/_bootstrap.scss"; @import "bootstrap-sass/assets/stylesheets/_bootstrap.scss";
@import "fontawesome/scss/font-awesome.scss"; @import "fontawesome/scss/font-awesome.scss";
@import "awesome-bootstrap-checkbox/awesome-bootstrap-checkbox"; @import "awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.scss";
@import "jquery-ui/themes/base/datepicker"; @import "datetimepicker/jquery.datetimepicker";
@import "simplemde/dist/simplemde.min"; @import "simplemde/dist/simplemde.min";
@import "SpinKit/css/spinners/11-folding-cube"; @import "SpinKit/css/spinners/11-folding-cube";
// Core // Core
@import "_var"; @import "_var";
@import "_fonts"; @import "_fonts";