# HG changeset patch # User Ludovic Chabant # Date 1453953892 28800 # Node ID 7e4e567377cdb1e4bf7b0ac10593574e082451fe # Parent c6bc0ef03f82bd462469a2ad8c5a9fce3bb0c8e8 cm: Put Bower/Gulp/etc. stuff all at the root. diff -r c6bc0ef03f82 -r 7e4e567377cd bower.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bower.json Wed Jan 27 20:04:52 2016 -0800 @@ -0,0 +1,21 @@ +{ + "name": "PieCrust", + "description": "", + "version": "0.0.1", + "private": "true", + "authors": [ + "Ludovic Chabant " + ], + "homepage": "http://bolt80.com/piecrust", + "ignore": [ + "node_modules", + "bower_components" + ], + "dependencies": { + "bootstrap": "~3.3.5", + "bootstrap-sass": "~3.3.5", + "font-awesome": "fontawesome#~4.5.0", + "Ionicons": "ionicons#~2.0.1" + } +} + diff -r c6bc0ef03f82 -r 7e4e567377cd docs/assets/css/piecrust.less --- a/docs/assets/css/piecrust.less Wed Jan 27 18:02:25 2016 -0800 +++ b/docs/assets/css/piecrust.less Wed Jan 27 20:04:52 2016 -0800 @@ -1,29 +1,31 @@ // Imports +@bootstrap-path: "../../../bower_components/bootstrap"; + // Core variables and mixins -@import "../../bower_components/bootstrap/less/variables.less"; -@import "../../bower_components/bootstrap/less/mixins.less"; +@import "@{bootstrap-path}/less/variables.less"; +@import "@{bootstrap-path}/less/mixins.less"; // Reset and dependencies -@import "../../bower_components/bootstrap/less/normalize.less"; -@import "../../bower_components/bootstrap/less/print.less"; -@import "../../bower_components/bootstrap/less/glyphicons.less"; +@import "@{bootstrap-path}/less/normalize.less"; +@import "@{bootstrap-path}/less/print.less"; +@import "@{bootstrap-path}/less/glyphicons.less"; // Core CSS -@import "../../bower_components/bootstrap/less/scaffolding.less"; -@import "../../bower_components/bootstrap/less/type.less"; -@import "../../bower_components/bootstrap/less/code.less"; -@import "../../bower_components/bootstrap/less/grid.less"; -@import "../../bower_components/bootstrap/less/forms.less"; -@import "../../bower_components/bootstrap/less/buttons.less"; +@import "@{bootstrap-path}/less/scaffolding.less"; +@import "@{bootstrap-path}/less/type.less"; +@import "@{bootstrap-path}/less/code.less"; +@import "@{bootstrap-path}/less/grid.less"; +@import "@{bootstrap-path}/less/forms.less"; +@import "@{bootstrap-path}/less/buttons.less"; // Components -@import "../../bower_components/bootstrap/less/component-animations.less"; -@import "../../bower_components/bootstrap/less/navs.less"; -@import "../../bower_components/bootstrap/less/navbar.less"; +@import "@{bootstrap-path}/less/component-animations.less"; +@import "@{bootstrap-path}/less/navs.less"; +@import "@{bootstrap-path}/less/navbar.less"; // Utility classes -@import "../../bower_components/bootstrap/less/utilities.less"; -@import "../../bower_components/bootstrap/less/responsive-utilities.less"; +@import "@{bootstrap-path}/less/utilities.less"; +@import "@{bootstrap-path}/less/responsive-utilities.less"; // Variables diff -r c6bc0ef03f82 -r 7e4e567377cd docs/assets/js/piecrust.js.concat --- a/docs/assets/js/piecrust.js.concat Wed Jan 27 18:02:25 2016 -0800 +++ b/docs/assets/js/piecrust.js.concat Wed Jan 27 20:04:52 2016 -0800 @@ -1,7 +1,7 @@ path_mode: absolute files: - - bower_components/jquery/dist/jquery.js - - bower_components/bootstrap/js/transition.js - - bower_components/bootstrap/js/collapse.js - - bower_components/bootstrap/js/scrollspy.js + - ../bower_components/jquery/dist/jquery.js + - ../bower_components/bootstrap/js/transition.js + - ../bower_components/bootstrap/js/collapse.js + - ../bower_components/bootstrap/js/scrollspy.js diff -r c6bc0ef03f82 -r 7e4e567377cd docs/bower.json --- a/docs/bower.json Wed Jan 27 18:02:25 2016 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -{ - "name": "PieCrust", - "version": "0.0.1", - "private": "true", - "dependencies": { - "bootstrap": "~3.3.2" - } -} diff -r c6bc0ef03f82 -r 7e4e567377cd foodtruckui/bower.json --- a/foodtruckui/bower.json Wed Jan 27 18:02:25 2016 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -{ - "name": "FoodTruck", - "description": "", - "authors": [ - "Ludovic Chabant " - ], - "homepage": "http://bolt80.com/piecrust", - "ignore": [ - "node_modules", - "bower_components" - ], - "dependencies": { - "bootstrap-sass": "~3.3.5", - "font-awesome": "fontawesome#~4.5.0", - "Ionicons": "ionicons#~2.0.1" - } -} diff -r c6bc0ef03f82 -r 7e4e567377cd foodtruckui/gulpfile.js --- a/foodtruckui/gulpfile.js Wed Jan 27 18:02:25 2016 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -'use strict'; - -var gulp = require('gulp'), - util = require('gulp-util'), - sass = require('gulp-sass'), - sourcemaps = require('gulp-sourcemaps'), - rename = require('gulp-rename'), - minify = require('gulp-minify-css'), - concat = require('gulp-concat'), - uglify = require('gulp-uglify'); - -// Stylesheets -gulp.task('sass', function() { - //util.log("Generating CSS"); - return gulp.src('assets/sass/**/*.scss') - //.pipe(sourcemaps.init()) - .pipe(sass({ - errLogToConsole: true, - outputStyle: 'compressed', - includePaths: [ - 'bower_components/bootstrap-sass/assets/stylesheets', - 'bower_components/Ionicons/scss']})) - //.pipe(sourcemaps.write()) - .pipe(rename({suffix: '.min'})) - .pipe(minify()) - .pipe(gulp.dest('../foodtruck/static/css')); -}); -gulp.task('sass:watch', function() { - return gulp.watch('assets/sass/**/*.scss', ['sass']); -}); - -// Javascript -gulp.task('js', function() { - return gulp.src([ - 'bower_components/jquery/dist/jquery.js', - 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/alert.js', - 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/button.js', - 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/collapse.js', - 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/dropdown.js', - 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/tooltip.js', - 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/transition.js', - 'assets/js/**/*.js' - ]) - .pipe(sourcemaps.init()) - .pipe(concat('foodtruck.js')) - .pipe(sourcemaps.write()) - .pipe(rename({suffix: '.min'})) - //.pipe(uglify()) - .pipe(gulp.dest('../foodtruck/static/js')); -}); -gulp.task('js:watch', function() { - return gulp.watch('assets/js/**/*.js', ['js']); -}); - -// Fonts/images -gulp.task('fonts', function() { - return gulp.src([ - 'bower_components/bootstrap-sass/assets/fonts/bootstrap/*', - 'bower_components/Ionicons/fonts/*' - ]) - .pipe(gulp.dest('../foodtruck/static/fonts')); -}); - -gulp.task('images', function() { - return gulp.src([ - 'bower_components/bootstrap-sass/assets/images/*', - 'assets/img/*' - ]) - .pipe(gulp.dest('../foodtruck/static/img')); -}); - -// Launch tasks -gulp.task('default', function() { - gulp.start(['sass', 'js', 'fonts', 'images']); -}); - -gulp.task('watch', function() { - gulp.start(['sass:watch', 'js:watch']); -}); - diff -r c6bc0ef03f82 -r 7e4e567377cd foodtruckui/package.json --- a/foodtruckui/package.json Wed Jan 27 18:02:25 2016 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -{ - "name": "FoodTruck", - "version": "1.0.0", - "devDependencies": { - "gulp": "~3.9.0", - "gulp-sass": "~2.1.0", - "gulp-minify-css": "~1.2.1", - "gulp-uglify": "~1.4.2", - "gulp-util": "~3.0.7", - "gulp-sourcemaps": "~1.6.0", - "gulp-rename": "~1.2.2", - "gulp-concat": "~2.6.0" - } -} diff -r c6bc0ef03f82 -r 7e4e567377cd gulpfile.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gulpfile.js Wed Jan 27 20:04:52 2016 -0800 @@ -0,0 +1,80 @@ +'use strict'; + +var gulp = require('gulp'), + util = require('gulp-util'), + sass = require('gulp-sass'), + sourcemaps = require('gulp-sourcemaps'), + rename = require('gulp-rename'), + minify = require('gulp-minify-css'), + concat = require('gulp-concat'), + uglify = require('gulp-uglify'); + +// Stylesheets +gulp.task('sass', function() { + return gulp.src('foodtruckui/assets/sass/**/*.scss') + //.pipe(sourcemaps.init()) + .pipe(sass({ + errLogToConsole: true, + outputStyle: 'compressed', + includePaths: [ + 'bower_components/bootstrap-sass/assets/stylesheets', + 'bower_components/Ionicons/scss']})) + //.pipe(sourcemaps.write()) + .pipe(rename({suffix: '.min'})) + .pipe(minify()) + .pipe(gulp.dest('../foodtruck/static/css')); +}); +gulp.task('sass:watch', function() { + return gulp.watch('foodtruckui/assets/sass/**/*.scss', ['sass']); +}); + +// Javascript +gulp.task('js', function() { + return gulp.src([ + 'bower_components/jquery/dist/jquery.js', + 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/alert.js', + 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/button.js', + 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/collapse.js', + 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/dropdown.js', + 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/tooltip.js', + 'bower_components/bootstrap-sass/assets/javascripts/bootstrap/transition.js', + 'foodtruckui/assets/js/**/*.js' + ]) + .pipe(sourcemaps.init()) + .pipe(concat('foodtruck.js')) + .pipe(sourcemaps.write()) + .pipe(rename({suffix: '.min'})) + //.pipe(uglify()) + .pipe(gulp.dest('../foodtruck/static/js')); +}); +gulp.task('js:watch', function() { + return gulp.watch('foodtruckui/assets/js/**/*.js', ['js']); +}); + +// Fonts/images +gulp.task('fonts', function() { + return gulp.src([ + 'bower_components/bootstrap-sass/assets/fonts/bootstrap/*', + 'bower_components/Ionicons/fonts/*' + ]) + .pipe(gulp.dest('../foodtruck/static/fonts')); +}); + +gulp.task('images', function() { + return gulp.src([ + 'bower_components/bootstrap-sass/assets/images/*', + 'foodtruckui/assets/img/*' + ]) + .pipe(gulp.dest('../foodtruck/static/img')); +}); + +// Launch tasks +gulp.task('default', function() { + gulp.start(['sass', 'js', 'fonts', 'images']); +}); + +gulp.task('watch', function() { + gulp.start(['sass:watch', 'js:watch']); +}); + + diff -r c6bc0ef03f82 -r 7e4e567377cd package.json --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/package.json Wed Jan 27 20:04:52 2016 -0800 @@ -0,0 +1,14 @@ +{ + "name": "PieCrust", + "version": "1.0.0", + "devDependencies": { + "gulp": "~3.9.0", + "gulp-sass": "~2.1.0", + "gulp-minify-css": "~1.2.1", + "gulp-uglify": "~1.4.2", + "gulp-util": "~3.0.7", + "gulp-sourcemaps": "~1.6.0", + "gulp-rename": "~1.2.2", + "gulp-concat": "~2.6.0" + } +}