From f83505cf17d573651b5b5b877fd3ae7e2476a0a6 Mon Sep 17 00:00:00 2001 From: Florian BLOUET Date: Mon, 23 Nov 2015 16:33:14 +0100 Subject: [PATCH] removed plugin custom styling for account and login --- package.json | 2 ++ resources/gulp/config.js | 21 +++++++++++++++++++ resources/gulp/install.js | 8 +++++++ resources/www/account/styles/main.scss | 2 +- resources/www/authentication/styles/main.scss | 2 +- 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d4dcc2a643..2ccf1af8de 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "bower-files": "^3.11.3", "browser-sync": "^2.10.0", "del": "^2.1.0", + "fs": "0.0.2", "gulp": "^3.9.0", "gulp-autoprefixer": "^3.1.0", "gulp-concat": "^2.6.0", @@ -22,6 +23,7 @@ "gulp-watch": "^4.3.5", "jake": "latest", "mocha-phantomjs": ">=2.0 <3.0", + "path": "^0.12.7", "tmp": "0.0.23", "uglify-js": "latest", "wrench": "^1.5.8" diff --git a/resources/gulp/config.js b/resources/gulp/config.js index 592157f8de..62e54afd59 100644 --- a/resources/gulp/config.js +++ b/resources/gulp/config.js @@ -1,3 +1,5 @@ +var path = require("path"); +var fs = require("fs"); var gutil = require("gulp-util"); var configPaths = { src: 'resources/www/', @@ -8,6 +10,25 @@ var configPaths = { exports.paths = configPaths; +/** + * ensure external override config is accessible + * @returns {boolean} + */ +exports.checkPath = function(userPath, log) { + "use strict"; + try { + fs.statSync(path.resolve(userPath) ); + if( log === true ) { + gutil.log(gutil.colors.green('[INFO]'), 'folder "'+userPath+'" exists'); + } + return true; + } catch(e) { + if( log === true ) { + gutil.log(gutil.colors.red('[WARNING]'), 'folder "' + userPath + '" not found'); + } + return false; + } +}; exports.errorHandler = function(title) { 'use strict'; diff --git a/resources/gulp/install.js b/resources/gulp/install.js index cf8b06009c..164a85c49c 100644 --- a/resources/gulp/install.js +++ b/resources/gulp/install.js @@ -26,6 +26,11 @@ gulp.task('build-dependencies', ['install-bower-dependencies'], function(){ gulp.start('build'); gulp.start('build-css'); }); +gulp.task('init-plugins-folder', function(){ + if( !config.checkPath('plugins', true)) { + // something to do in plugins folder? + } +}); /** @@ -37,5 +42,8 @@ gulp.task('install-assets', function(){ }); gulp.task('install', ['clean:assetsPath'], function(){ + + // ensure plugins path exists + gulp.start('init-plugins-folder'); gulp.start('build-dependencies'); }); diff --git a/resources/www/account/styles/main.scss b/resources/www/account/styles/main.scss index 2ef9dc2aef..fde1532898 100644 --- a/resources/www/account/styles/main.scss +++ b/resources/www/account/styles/main.scss @@ -1,6 +1,6 @@ // @import '../../../../www/bower_components/normalize-css/normalize'; // not extension for inline import @import '../../_shared/styles/variables'; -@import '../../../../plugins/account.scss'; +// @import '../../../../plugins/account.scss'; @import 'variables'; @import '../../vendors/bootstrap/bootstrap'; @import 'skin'; diff --git a/resources/www/authentication/styles/main.scss b/resources/www/authentication/styles/main.scss index e18a76e22a..9a1535f9cb 100644 --- a/resources/www/authentication/styles/main.scss +++ b/resources/www/authentication/styles/main.scss @@ -4,7 +4,7 @@ @import 'variables'; @import '../../vendors/bootstrap/bootstrap'; @import '../../account/styles/skin'; -@import '../../../../plugins/login.scss'; +//@import '../../../../plugins/login.scss'; @import '../../../../www/bower_components/font-awesome/sass/font-awesome.scss'; @import '../../../../www/bower_components/jquery-ui/themes/base/jquery.ui.autocomplete'; // not extension for inline import \ No newline at end of file