diff --git a/gulp/conf.js b/gulp/conf.js index 30996d4..ea681bc 100644 --- a/gulp/conf.js +++ b/gulp/conf.js @@ -6,7 +6,9 @@ * of the tasks */ +var argv = require('minimist')(process.argv.slice(2)); var gutil = require('gulp-util'); +var path = require('path'); /** * The main paths of your project handle these with care @@ -16,8 +18,13 @@ exports.paths = { dist: 'dist', tmp: '.tmp', e2e: 'e2e', - docs: 'docs' + docs: 'docs', + theme: argv.theme ? path.join('themes', argv.theme) : null }; +exports.paths.allSources = [exports.paths.src]; +if(exports.paths.theme) { + exports.paths.allSources.push(exports.paths.theme); +} /** * Wiredep is the lib which inject bower dependencies in your project diff --git a/gulp/styles.js b/gulp/styles.js index b46de71..6a4d69a 100644 --- a/gulp/styles.js +++ b/gulp/styles.js @@ -25,11 +25,14 @@ var buildStyles = function() { style: 'expanded' }; - var injectFiles = gulp.src([ - path.join(conf.paths.src, '/app/**/*.scss'), + var srcPaths = [ path.join('!' + conf.paths.src, '/app/index.scss'), path.join('!' + conf.paths.src, '/app/layout/scss/*.scss') - ], { read: false }); + ]; + conf.paths.allSources.forEach(function(src) { + srcPaths.push(path.join(src, '/app/**/*.scss')); + }); + var injectFiles = gulp.src(srcPaths, { read: false }); var injectOptions = { transform: function(filePath) { diff --git a/package.json b/package.json index afddbe4..e3fb2ff 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "ng-forward": "0.0.1-alpha.12" }, "scripts": { - "build": "webpack; gulp clean && gulp build", + "build": "webpack; gulp clean && gulp --theme=$npm_package_config_theme build", "webpack": "webpack", "karma": "concurrently \"webpack -w\" \"karma start\"", "docs": "gulp ngdocs; static-server docs", @@ -19,7 +19,7 @@ "test": "webpack -w --test", "jenkins": "webpack && karma start --single-run", "postinstall": "bower install; typings install; cd dev-scripts; typings install; cd ../; npm run fix-jqlite", - "start": "concurrently \"webpack -w\" \"gulp serve\"", + "start": "concurrently \"webpack -w\" \"gulp --theme=$npm_package_config_theme serve\"", "generate-indexes": "ts-node --project ./dev-scripts ./dev-scripts/generate-index-modules.ts", "fix-jqlite": "ts-node --project ./dev-scripts dev-scripts/fix-jqlite.ts" }, diff --git a/src/app/layout/navbar/redebrasil.scss b/src/app/layout/navbar/redebrasil.scss deleted file mode 100644 index a59edae..0000000 --- a/src/app/layout/navbar/redebrasil.scss +++ /dev/null @@ -1,16 +0,0 @@ -.navbar { - min-height: 123px; - background:url("../assets/images/redebrasil/bg-header.png") repeat-x; - - .container-fluid { - .navbar-brand { - .noosfero-logo { - background:url("../assets/images/redebrasil/header-home.png") no-repeat; - padding: 0px 257px 63px 15px; - } - .noosfero-name { - display: none; - } - } - } -} diff --git a/src/app/redebrasil.scss b/src/app/redebrasil.scss deleted file mode 100644 index 26cf0a9..0000000 --- a/src/app/redebrasil.scss +++ /dev/null @@ -1,8 +0,0 @@ -body > .ng-scope { - background:url("../assets/images/redebrasil/fundo-portal.jpg") center top #59666E no-repeat ; - min-height: 100%; -} - -html, body { - height:100%; -} diff --git a/themes/rede-brasil/app/navbar.scss b/themes/rede-brasil/app/navbar.scss new file mode 100644 index 0000000..a59edae --- /dev/null +++ b/themes/rede-brasil/app/navbar.scss @@ -0,0 +1,16 @@ +.navbar { + min-height: 123px; + background:url("../assets/images/redebrasil/bg-header.png") repeat-x; + + .container-fluid { + .navbar-brand { + .noosfero-logo { + background:url("../assets/images/redebrasil/header-home.png") no-repeat; + padding: 0px 257px 63px 15px; + } + .noosfero-name { + display: none; + } + } + } +} diff --git a/themes/rede-brasil/app/redebrasil.scss b/themes/rede-brasil/app/redebrasil.scss new file mode 100644 index 0000000..26cf0a9 --- /dev/null +++ b/themes/rede-brasil/app/redebrasil.scss @@ -0,0 +1,8 @@ +body > .ng-scope { + background:url("../assets/images/redebrasil/fundo-portal.jpg") center top #59666E no-repeat ; + min-height: 100%; +} + +html, body { + height:100%; +} -- libgit2 0.21.2