diff --git a/resources/gulpfile.js b/gulpfile.js similarity index 55% rename from resources/gulpfile.js rename to gulpfile.js index cb8f57de2..ff3990860 100644 --- a/resources/gulpfile.js +++ b/gulpfile.js @@ -4,11 +4,11 @@ var gulp = require('gulp'); var sass = require('gulp-sass'); gulp.task('sass', function () { - return gulp.src('./sass/**/*.scss') + return gulp.src('./resources/sass/**/*.scss') .pipe(sass.sync().on('error', sass.logError)) - .pipe(gulp.dest('./css')); + .pipe(gulp.dest('./resources/css')); }); gulp.task('sass:watch', function () { - gulp.watch('./sass/**/*.scss', gulp.series('sass')); + gulp.watch('./resources/sass/**/*.scss', gulp.series('sass')); }); diff --git a/package.json b/package.json index c0a089402..b0e6a4bf1 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,16 @@ { "name": "photobooth", - "version": "1.0.0", - "description": "photobooth sass setup", - "main": "index.js", + "version": "1.8.3", + "description": "A Photobooth webinterface for Raspberry Pi and Windows", "scripts": { + "build": "gulp sass", + "watch": "gulp sass:watch", "test": "echo \"Error: no test specified\" && exit 1" }, "author": "", - "license": "GPL", + "license": "MIT", "dependencies": { - "bower": "1.7.9", "gulp": "4.0.2", "gulp-sass": "4.0.2" } } - diff --git a/resources/config.rb b/resources/config.rb deleted file mode 100644 index e9944ff46..000000000 --- a/resources/config.rb +++ /dev/null @@ -1,25 +0,0 @@ -require 'compass/import-once/activate' -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "/" -css_dir = "css" -sass_dir = "sass" -images_dir = "img" -javascripts_dir = "js" - -# You can select your preferred output style here (can be overridden via the command line): -# output_style = :expanded or :nested or :compact or :compressed - -# To enable relative paths to assets via compass helper functions. Uncomment: -# relative_assets = true - -# To disable debugging comments that display the original location of your selectors. Uncomment: -# line_comments = false - - -# If you prefer the indented syntax, you might want to regenerate this -# project again passing --syntax sass, or you can uncomment this: -# preferred_syntax = :sass -# and then run: -# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass diff --git a/resources/package.json b/resources/package.json deleted file mode 100644 index e8dc95ff7..000000000 --- a/resources/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "photobooth", - "version": "1.0.0", - "description": "photobooth sass setup", - "main": "index.js", - "scripts": { - "build": "gulp sass", - "watch": "gulp sass:watch", - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "GPL", - "dependencies": { - "gulp": "4.0.2", - "gulp-sass": "4.0.2" - } -}