couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [37/50] couchdb commit: updated refs/heads/Update-Sidebar-Ui to 01dcb16
Date Mon, 30 Jun 2014 08:23:48 GMT
update icons location


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d1d71cb8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d1d71cb8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d1d71cb8

Branch: refs/heads/Update-Sidebar-Ui
Commit: d1d71cb853f119279c8d44a9d143dc1f5ceba5aa
Parents: 9907f3c
Author: Garren Smith <garren.smith@gmail.com>
Authored: Wed Jun 18 17:14:21 2014 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Mon Jun 30 10:20:25 2014 +0200

----------------------------------------------------------------------
 src/fauxton/assets/less/bootstrap/font-awesome/variables.less | 2 +-
 src/fauxton/tasks/couchserver.js                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d1d71cb8/src/fauxton/assets/less/bootstrap/font-awesome/variables.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/font-awesome/variables.less b/src/fauxton/assets/less/bootstrap/font-awesome/variables.less
index 0715887..262f88d 100644
--- a/src/fauxton/assets/less/bootstrap/font-awesome/variables.less
+++ b/src/fauxton/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/blob/d1d71cb8/src/fauxton/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/couchserver.js b/src/fauxton/tasks/couchserver.js
index 1651091..4507dd3 100644
--- a/src/fauxton/tasks/couchserver.js
+++ b/src/fauxton/tasks/couchserver.js
@@ -63,7 +63,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);


Mime
View raw message