From 8462b9d3dcbd789d4ca61984584c3d284bee486d Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Fri, 31 Jan 2014 16:59:16 -0500 Subject: [PATCH 1/3] fixed settings.json.dev; added fauxton & cachebuster --- src/fauxton/settings.json.dev | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/fauxton/settings.json.dev b/src/fauxton/settings.json.dev index e2df66ba8ed..d354c29fff9 100644 --- a/src/fauxton/settings.json.dev +++ b/src/fauxton/settings.json.dev @@ -1,5 +1,6 @@ { "deps": [ + { "name": "fauxton" }, { "name": "databases" }, { "name": "documents" }, { "name": "pouchdb" }, @@ -23,7 +24,8 @@ "variables": { "requirejs": "/assets/js/libs/require.js", "css": "./css/index.css", - "base": null + "base": null, + "cachebuster": "" }, "app": { "root": "/", @@ -37,7 +39,8 @@ "variables": { "requirejs": "./js/require.js", "css": "./css/index.css", - "base": null + "base": null, + "cachebuster": "?v1.0" }, "app": { "root": "/_utils/fauxton/", From b8fe3cb10299cbabf4274d6071368734c3880511 Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Mon, 3 Feb 2014 11:28:09 -0500 Subject: [PATCH 2/3] 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. --- src/fauxton/Gruntfile.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js index 2c5a24906d8..554eccb78ad 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' }, From 34aabbfb58ca4f0ed60a20c466b6bf544b7dc28f Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Mon, 3 Feb 2014 15:20:26 -0500 Subject: [PATCH 3/3] nv.d3.css is the one CSS used in Fauxton And now it is loaded before the fauxton.less file. Other options would include moving/renaming it (to a .less file) and making it an @import. Not necessary this time, but may be for other needed CSS. --- src/fauxton/Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js index 554eccb78ad..9507a60f099 100644 --- a/src/fauxton/Gruntfile.js +++ b/src/fauxton/Gruntfile.js @@ -67,7 +67,7 @@ module.exports = function(grunt) { img: ["assets/img/**"], // used in concat:index_css to keep file ordering intact // fauxton.css should load first - css: ["dist/debug/css/fauxton.css"] + css: ["assets/css/*.css", "dist/debug/css/fauxton.css"] }; helper.processAddons(function(addon){ // Less files from addons