taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix custom-themes compile

stable
Juanfran 2016-02-02 09:20:50 +01:00
parent f40b9acc92
commit 6e2ba7943e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gulpfile.js
View File

@ -27,6 +27,7 @@ var gulp = require("gulp"),
del = require("del"), del = require("del"),
livereload = require('gulp-livereload'), livereload = require('gulp-livereload'),
gulpFilter = require('gulp-filter'), gulpFilter = require('gulp-filter'),
addsrc = require('gulp-add-src');
coffeelint = require('gulp-coffeelint'); coffeelint = require('gulp-coffeelint');
var argv = require('minimist')(process.argv.slice(2)); var argv = require('minimist')(process.argv.slice(2));
@ -70,10 +71,10 @@ paths.locales = paths.app + "locales/**/*.json";
paths.sass = [ paths.sass = [
paths.app + "**/*.scss", paths.app + "**/*.scss",
"!" + paths.app + "/styles/bourbon/**/*.scss", "!" + paths.app + "styles/bourbon/**/*.scss",
"!" + paths.app + "/styles/dependencies/**/*.scss", "!" + paths.app + "styles/dependencies/**/*.scss",
"!" + paths.app + "/styles/extras/**/*.scss", "!" + paths.app + "styles/extras/**/*.scss",
"!" + paths.app + "/themes/**/variables.scss", "!" + paths.app + "themes/**/*.scss",
]; ];
paths.sass_watch = paths.sass.concat(themes.current.customScss); paths.sass_watch = paths.sass.concat(themes.current.customScss);
@ -85,7 +86,8 @@ paths.styles_dependencies = [
paths.css = [ paths.css = [
paths.tmp + "styles/**/*.css", paths.tmp + "styles/**/*.css",
paths.tmp + "modules/**/*.css" paths.tmp + "modules/**/*.css",
paths.tmp + "custom.css"
]; ];
paths.css_order = [ paths.css_order = [
@ -101,7 +103,7 @@ paths.css_order = [
paths.tmp + "styles/modules/**/*.css", paths.tmp + "styles/modules/**/*.css",
paths.tmp + "modules/**/*.css", paths.tmp + "modules/**/*.css",
paths.tmp + "styles/shame/*.css", paths.tmp + "styles/shame/*.css",
paths.tmp + "themes/**/*.css" paths.tmp + "custom.css"
]; ];
paths.coffee = [ paths.coffee = [
@ -259,9 +261,8 @@ gulp.task("clear-sass-cache", function() {
}); });
gulp.task("sass-compile", [], function() { gulp.task("sass-compile", [], function() {
var sassFiles = paths.sass.concat(themes.current.customScss); return gulp.src(paths.sass)
.pipe(addsrc.append(themes.current.customScss))
return gulp.src(sassFiles)
.pipe(plumber()) .pipe(plumber())
.pipe(insert.prepend('@import "dependencies";')) .pipe(insert.prepend('@import "dependencies";'))
.pipe(cached("sass")) .pipe(cached("sass"))
@ -292,9 +293,7 @@ gulp.task("css-lint-app", function() {
}); });
gulp.task("app-css", function() { gulp.task("app-css", function() {
var cssFiles = paths.css.concat(themes.current.customCss); return gulp.src(paths.css)
return gulp.src(cssFiles)
.pipe(order(paths.css_order, {base: '.'})) .pipe(order(paths.css_order, {base: '.'}))
.pipe(concat("theme-" + themes.current.name + ".css")) .pipe(concat("theme-" + themes.current.name + ".css"))
.pipe(autoprefixer({ .pipe(autoprefixer({

1
package.json
View File

@ -34,6 +34,7 @@
"express": "^4.12.0", "express": "^4.12.0",
"glob": "^5.0.14", "glob": "^5.0.14",
"gulp": "^3.8.11", "gulp": "^3.8.11",
"gulp-add-src": "^0.2.0",
"gulp-angular-templatecache": "^1.5.0", "gulp-angular-templatecache": "^1.5.0",
"gulp-autoprefixer": "^3.0.1", "gulp-autoprefixer": "^3.0.1",
"gulp-cache": "^0.3.0", "gulp-cache": "^0.3.0",