You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2017/02/24 06:56:18 UTC
fauxton commit: updated refs/heads/master to b940979
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master dd46a41df -> b940979f7
fix font routes
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b940979f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b940979f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b940979f
Branch: refs/heads/master
Commit: b940979f7456168f33d7aabb7116c66de6b03c9e
Parents: dd46a41
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Feb 23 23:29:34 2017 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Feb 23 23:29:34 2017 +0200
----------------------------------------------------------------------
Gruntfile.js | 2 +-
settings.json.default.json | 2 +-
webpack.config.release.js | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b940979f/Gruntfile.js
----------------------------------------------------------------------
diff --git a/Gruntfile.js b/Gruntfile.js
index 61d6cc4..1eb6946 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -211,7 +211,7 @@ module.exports = function (grunt) {
},
css: {
- files: { 'dist/release/': 'dist/release/styles.css' },
+ files: { 'dist/release/dashboard.assets/css/': 'dist/release/styles.css' },
options: {
afterEach: function (fileChanges) {
// replace the CSS_FILE placeholder with the actual filename
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b940979f/settings.json.default.json
----------------------------------------------------------------------
diff --git a/settings.json.default.json b/settings.json.default.json
index 0f5756e..510f7f2 100644
--- a/settings.json.default.json
+++ b/settings.json.default.json
@@ -36,7 +36,7 @@
"dest": "dist/debug/index.html",
"variables": {
"bundlejs": "./dashboard.assets/js/BUNDLEJS_FILE",
- "css": "./CSS_FILE",
+ "css": "./dashboard.assets/css/CSS_FILE",
"base": null,
"development": false
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b940979f/webpack.config.release.js
----------------------------------------------------------------------
diff --git a/webpack.config.release.js b/webpack.config.release.js
index ce873b4..0b71897 100644
--- a/webpack.config.release.js
+++ b/webpack.config.release.js
@@ -70,7 +70,9 @@ module.exports = {
loader: "expose?Backbone"
},
{ test: /\.less/,
- loader: ExtractTextPlugin.extract("style-loader", "css-loader!less-loader")
+ loader: ExtractTextPlugin.extract("style-loader", "css-loader!less-loader", {
+ publicPath: '../../'
+ }),
},
{ test: /\.css$/, loader: 'style!css' },
{