Updated Branches: refs/heads/master 918563154 -> 34aabbfb5
fixed .css concat ordering in index.css This change removes the loading of .css files from /addons/**/assets/css/*.css. Putting those back is an option, but since unused at present I saw it as a separate case for adding back if/when desired. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b8fe3cb1 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b8fe3cb1 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b8fe3cb1 Branch: refs/heads/master Commit: b8fe3cb10299cbabf4274d6071368734c3880511 Parents: 8462b9d Author: BigBlueHat <[email protected]> Authored: Mon Feb 3 11:28:09 2014 -0500 Committer: BigBlueHat <[email protected]> Committed: Mon Feb 3 11:29:00 2014 -0500 ---------------------------------------------------------------------- src/fauxton/Gruntfile.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b8fe3cb1/src/fauxton/Gruntfile.js ---------------------------------------------------------------------- diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js index 2c5a249..554eccb 100644 --- a/src/fauxton/Gruntfile.js +++ b/src/fauxton/Gruntfile.js @@ -64,7 +64,10 @@ module.exports = function(grunt) { "dist/debug/css/fauxton.css": "assets/less/fauxton.less" } }, - img: ["assets/img/**"] + img: ["assets/img/**"], + // used in concat:index_css to keep file ordering intact + // fauxton.css should load first + css: ["dist/debug/css/fauxton.css"] }; helper.processAddons(function(addon){ // Less files from addons @@ -75,6 +78,7 @@ module.exports = function(grunt) { theAssets.less.paths.push(lessPath); theAssets.less.files["dist/debug/css/" + addon.name + ".css"] = lessPath + "/" + addon.name + ".less"; + theAssets.css.push("dist/debug/css/" + addon.name + ".css"); } // Images root = addon.path || "app/addons/" + addon.name; @@ -210,7 +214,7 @@ module.exports = function(grunt) { }, index_css: { - src: ["dist/debug/css/*.css", '!dist/debug/css/index.css', 'assets/css/*.css'], + src: assets.css, dest: 'dist/debug/css/index.css' },
