You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/02/12 07:20:39 UTC
[45/52] [abbrv] fauxton commit: updated refs/heads/import-master to
d11b90b
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-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/c514de12
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/c514de12
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/c514de12
Branch: refs/heads/import-master
Commit: c514de12adeb4c070dbf199ce222ea80557e98a5
Parents: a15c507
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Mon Feb 3 11:28:09 2014 -0500
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Mon Feb 3 11:29:00 2014 -0500
----------------------------------------------------------------------
Gruntfile.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c514de12/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index 2c5a249..554eccb 100644
--- a/Gruntfile.js
+++ b/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'
},