diff options
| author | BigBlueHat <byoung@bigbluehat.com> | 2014-02-03 11:28:09 -0500 |
|---|---|---|
| committer | BigBlueHat <byoung@bigbluehat.com> | 2014-02-03 11:29:00 -0500 |
| commit | b8fe3cb10299cbabf4274d6071368734c3880511 (patch) | |
| tree | 13f3480a3c9ad93c406b4ebf9329a7a352e029d5 | |
| parent | 8462b9d3dcbd789d4ca61984584c3d284bee486d (diff) | |
| download | couchdb-b8fe3cb10299cbabf4274d6071368734c3880511.tar.gz | |
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.
| -rw-r--r-- | src/fauxton/Gruntfile.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js index 2c5a24906..554eccb78 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' }, |