Permalink
Browse files

add js to gulp watch; change css order

  • Loading branch information...
Bloggerschmidt committed Nov 9, 2017
1 parent 9e21c18 commit db984d0b7c1a6825add742760c9a83c255fa5d9a
Showing with 10 additions and 4 deletions.
  1. +2 −1 gulpfile.js
  2. +3 −0 scss/_custom.scss
  3. +1 −2 scss/{_template.scss → _variables.scss}
  4. +4 −1 scss/main.scss
View
@@ -41,8 +41,9 @@ gulp.task('serve', ['sass'], function() {
browserSync.init({
// server: './'' // default server
// proxy: 'http://localhost:8888/' // mamp
proxy: 'http://localhost/bl4nk/' // usualy
proxy: 'http://localhost/blank/' // usualy
});
gulp.watch(['js/**/*.js'], ['js']);
gulp.watch(['scss/**/*.scss'], ['sass']);
gulp.watch("*.php").on('change', browserSync.reload);
});
View
@@ -0,0 +1,3 @@
// TEMPLATE STYLES
// custom code
@@ -1,6 +1,6 @@
// TEMPLATE STYLES
// bootstrap overrides (taken from variables.scss)
// bootstrap overrides only (taken from variables.scss)
// hint: write values without !default
$blue: #007bff;
@@ -15,4 +15,3 @@ $teal: #20c997;
$cyan: #17a2b8;
$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
View
@@ -1,5 +1,5 @@
// template
@import "template";
@import "variables";
// bootstrap
// required
@@ -53,3 +53,6 @@
@import "font-awesome/stacked";
@import "font-awesome/icons";
@import "font-awesome/screen-reader";
// template
@import "custom";

0 comments on commit db984d0

Please sign in to comment.