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 2014/07/21 09:03:15 UTC
[31/44] fauxton commit: updated refs/heads/Update-Sidebar to a41bdb0
update icons location
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/dc5810b3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/dc5810b3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/dc5810b3
Branch: refs/heads/Update-Sidebar
Commit: dc5810b3a3068b77b50533e4d5a1f921094d1810
Parents: 595a2d3
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Jun 18 17:14:21 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Jul 21 09:02:18 2014 +0200
----------------------------------------------------------------------
assets/less/bootstrap/font-awesome/variables.less | 2 +-
tasks/couchserver.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/dc5810b3/assets/less/bootstrap/font-awesome/variables.less
----------------------------------------------------------------------
diff --git a/assets/less/bootstrap/font-awesome/variables.less b/assets/less/bootstrap/font-awesome/variables.less
index 0715887..262f88d 100644
--- a/assets/less/bootstrap/font-awesome/variables.less
+++ b/assets/less/bootstrap/font-awesome/variables.less
@@ -1,7 +1,7 @@
// Variables
// --------------------------
-@FontAwesomePath: "../img";
+@FontAwesomePath: "../fonts";
//@FontAwesomePath: "//netdna.bootstrapcdn.com/font-awesome/3.2.1/font"; // for referencing Bootstrap CDN font files directly
@FontAwesomeVersion: "3.2.1";
@borderColor: #eee;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/dc5810b3/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/tasks/couchserver.js b/tasks/couchserver.js
index 432ad1d..539b3dc 100644
--- a/tasks/couchserver.js
+++ b/tasks/couchserver.js
@@ -60,7 +60,7 @@ module.exports = function (grunt) {
} else if (!!url.match(/mocha|\/test\/core\/|test\.config/)) {
filePath = path.join('./test', url.replace('/test/',''));
} else if (!!url.match(/fonts/)) {
- filePath = path.join(dist_dir,url);
+ filePath = path.join(dist_dir,url.split('?v=')[0]);
} else if (!!url.match(/\.css|img/)) {
url = url.replace(/\?.*/, '');
filePath = path.join(dist_dir,url);