fmartingr/fmartingr.com
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

New layout

Browse source
This commit is contained in:
Felipe M 2020-01-12 20:26:01 +01:00
parent 440e7a3994
commit f6a070f084
Signed by: fmartingr
GPG key ID: 716BC147715E716F
45 changed files with 661 additions and 758 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gulpfile.js
View file

@ -1,32 +1,26 @@
'use strict';
var gulp = require('gulp');
// Styles
var sass = require('gulp-sass');
var concatCss = require('gulp-concat-css');
var concatJs = require('gulp-concat');
var merge = require('merge-stream');
var minifyCss = require('gulp-minify-css');
var livereload = require('gulp-livereload');
var yargs = require('yargs').argv;
var minify = require('gulp-minify');
gulp.task('sass', function () {
var sassStream = gulp.src('./assets/static/sass/style.sass')
gulp.task('sass', function() {
var sassStream = gulp.src('./static/sass/style.sass')
.pipe(sass().on('error', sass.logError));
// var bowerStream = gulp.src([]);
return merge(sassStream)
.pipe(concatCss("style.css"))
.pipe(minifyCss())
.pipe(gulp.dest('./assets/static/css'))
.pipe(livereload());
.pipe(gulp.dest('./assets/static/css'));
});
gulp.task('js', function () {
gulp.task('js', function() {
var jsStream = gulp.src([
'./assets/static/js/main.js'
'./static/js/main.js'
]);
return jsStream
.pipe(concatJs('app.js'))
@ -37,12 +31,6 @@ gulp.task('js', function () {
.pipe(gulp.dest('./assets/static/js'))
})
gulp.task('livereload', function () {
return gulp.src('./templates/**/*.html').pipe(livereload());
});
gulp.task('sass:watch', function () {
livereload.listen();
gulp.watch('./assets/static/sass/*', gulp.parallel(['sass']));
gulp.watch('./assets/static/templates/**/*.html', gulp.parallel(['livereload']));
});
gulp.task('sass:watch', function() {
gulp.watch('./static/sass/*', gulp.parallel(['sass']));
});