From 7ef1468b3d17b90cb33a6f52405e8d1364889b82 Mon Sep 17 00:00:00 2001 From: Guilherme Henrique Luchesi Date: Fri, 8 Sep 2017 15:37:47 -0300 Subject: [PATCH 1/5] troca gulp-compass por gulp-sass que nao usa ruby --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c003a3..4b324c6 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "colors": "^0.6.2", "gulp": "^3.8.6", "gulp-clean": "^0.3.1", - "gulp-compass": "^1.1.9", "gulp-concat": "^2.3.3", "gulp-download": "0.0.1", "gulp-ftp": "^0.4.0", @@ -18,6 +17,7 @@ "gulp-minify-css": "^0.3.7", "gulp-plumber": "^0.6.4", "gulp-rename": "^1.2.0", + "gulp-sass": "^3.1.0", "gulp-uglify": "^0.3.1", "gulp-zip": "^0.4.0", "rsyncwrapper": "^0.4.0" From b17dcb954218a6397cd8079c3a4314f64dfbd502 Mon Sep 17 00:00:00 2001 From: Guilherme Henrique Luchesi Date: Fri, 8 Sep 2017 15:38:17 -0300 Subject: [PATCH 2/5] atualiza versao do gulp-imagemin --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b324c6..21c4292 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "gulp-concat": "^2.3.3", "gulp-download": "0.0.1", "gulp-ftp": "^0.4.0", - "gulp-imagemin": "^0.6.1", + "gulp-imagemin": "^3.3.0", "gulp-jshint": "^1.7.1", "gulp-minify-css": "^0.3.7", "gulp-plumber": "^0.6.4", From 11748249ad17ce4aa3bc8eb58d915fba4e34d52c Mon Sep 17 00:00:00 2001 From: Guilherme Henrique Luchesi Date: Fri, 8 Sep 2017 15:38:47 -0300 Subject: [PATCH 3/5] troca build de compass por sass --- gulpfile.js | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 2f640e1..9c70309 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,13 +3,13 @@ var fs = require( 'fs' ); var gulp = require( 'gulp' ); var clean = require( 'gulp-clean' ); -var compass = require( 'gulp-compass' ); +var sass = require( 'gulp-sass' ); var plumber = require( 'gulp-plumber' ); var imagemin = require( 'gulp-imagemin' ); var jshint = require( 'gulp-jshint' ); var minifycss = require( 'gulp-minify-css' ); var rename = require( 'gulp-rename' ); -var gulpconcat = require( 'gulp-concat' ); +var gulpconcat = require( 'gulp-concat' ); var uglify = require( 'gulp-uglify' ); var zip = require( 'gulp-zip' ); var rsync = require( 'rsyncwrapper' ).rsync; @@ -64,16 +64,10 @@ gulp.task( 'uglify-bootstrap', [ 'clean-bootstrap' ], function() { -gulp.task( 'compass', function() { +gulp.task( 'sass', function() { var stream = gulp.src( gulpconfig.dirs.sass + '/**/*' ) .pipe( plumber() ) - .pipe( - compass({ - config_file : './config.rb', - css : gulpconfig.dirs.css, - sass: gulpconfig.dirs.sass - }) - ) + .pipe( sass().on('error', sass.logError) ) .pipe( minifycss() ) .pipe( gulp.dest( gulpconfig.dirs.css ) ); @@ -84,7 +78,7 @@ gulp.task( 'compass', function() { gulp.task( 'watch', function() { var watchers = [ - gulp.watch( gulpconfig.dirs.sass + '/**/*', [ 'compass' ] ), + gulp.watch( gulpconfig.dirs.sass + '/**/*', [ 'sass' ] ), gulp.watch( gulpconfig.dirs.src_js + '/**/*.js', [ 'uglify' ] ) ]; @@ -256,12 +250,12 @@ gulp.task( 'clean-bootstrap', [ 'rename' ], function() { /** * Execution Tasks */ -gulp.task( 'default', [ 'jshint', 'compass', 'uglify' ] ); +gulp.task( 'default', [ 'jshint', 'sass', 'uglify' ] ); gulp.task( 'optimize', [ 'imagemin' ] ); gulp.task( 'ftp', [ 'ftp-deploy' ] ); gulp.task( 'compress', [ 'default', 'zip' ] ); gulp.task( 'bootstrap', [ 'uglify-bootstrap' ], function() { - gulp.start( 'compass' ); + gulp.start( 'sass' ); }); From 84162f996e1b44ac52f9335d12f0d86973b8d764 Mon Sep 17 00:00:00 2001 From: Guilherme Henrique Luchesi Date: Fri, 8 Sep 2017 15:39:01 -0300 Subject: [PATCH 4/5] atualiza versao do pacote --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 21c4292..04a0848 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "odin", "description": "Tema base para desenvolvimento em WordPress", - "version": "2.2.3", + "version": "2.2.4", "title": "Odin Framework", "homepage": "http://wpod.in/", "main": "gulpfile.js", From 67e2f81be78cf9430d8a883bc8055f1e5b0a056c Mon Sep 17 00:00:00 2001 From: Guilherme Henrique Luchesi Date: Fri, 8 Sep 2017 15:45:37 -0300 Subject: [PATCH 5/5] remove arquivo de configuracao do ruby --- config.rb | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 config.rb diff --git a/config.rb b/config.rb deleted file mode 100644 index dd769b9..0000000 --- a/config.rb +++ /dev/null @@ -1,28 +0,0 @@ -# Require any additional compass plugins here. - -# Set this to the root of your project when deployed: -http_path = "" -css_dir = "../assets/css" -sass_dir = "../assets/sass" -images_dir = "../assets/images" -fonts_dir = "../assets/fonts" -javascripts_dir = "../assets/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 -output_style = (environment == :production) ? :compressed : :expanded - -# 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 - -# Work with Sourcemaps -# sass_options = { :debug_info => true } - -# 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