From f7b64d655a31e04096a8e0945e6551cefa184bae Mon Sep 17 00:00:00 2001 From: Anil Mandepudi Date: Wed, 2 Nov 2016 09:57:54 -0700 Subject: [PATCH] Fix issue where CSS files imported along with less files are not getting minified (#5178) --- src/meta/css.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/meta/css.js b/src/meta/css.js index 7284f12540..a2842c14e8 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -48,7 +48,7 @@ module.exports = function (Meta) { async.waterfall([ function (next) { - getStyleSource(plugins.cssFiles, '\n@import (inline) ".', '.css', next); + getStyleSource(plugins.cssFiles, '\n@import (less) ".', '.css', next); }, function (src, next) { source += src; @@ -65,10 +65,10 @@ module.exports = function (Meta) { var acpSource = source; - source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui.css";'; - source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";'; - source += '\n@import (inline) "..' + path.sep + '..' + path.sep + 'node_modules/cookieconsent/build/cookieconsent.min.css";'; - source += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";'; + source += '\n@import (less) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui.css";'; + source += '\n@import (less) "..' + path.sep + '..' + path.sep + 'public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css";'; + source += '\n@import (less) "..' + path.sep + '..' + path.sep + 'node_modules/cookieconsent/build/cookieconsent.min.css";'; + source += '\n@import (less) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";'; source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/flags.less";'; source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/blacklist.less";'; source += '\n@import "..' + path.sep + '..' + path.sep + 'public/less/generics.less";'; @@ -78,8 +78,8 @@ module.exports = function (Meta) { acpSource += '\n@import "..' + path.sep + 'public/less/admin/admin";\n'; acpSource += '\n@import "..' + path.sep + 'public/less/generics.less";\n'; - acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";\n'; - acpSource += '\n@import (inline) "..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui.css";'; + acpSource += '\n@import (less) "..' + path.sep + 'public/vendor/colorpicker/colorpicker.css";\n'; + acpSource += '\n@import (less) "..' + path.sep + 'public/vendor/jquery/css/smoothness/jquery-ui.css";'; var fromFile = nconf.get('from-file') || '';