couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [22/39] updated fontcustom to compile to "/fonts" directory vs "/img"
Date Wed, 11 Jun 2014 12:56:38 GMT
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/img/fontawesome-webfont.woff
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/fontawesome-webfont.woff b/src/fauxton/assets/img/fontawesome-webfont.woff
deleted file mode 100755
index b9bd17e..0000000
Binary files a/src/fauxton/assets/img/fontawesome-webfont.woff and /dev/null differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/less/icons.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/icons.less b/src/fauxton/assets/less/icons.less
index 4626a98..fcc7529 100644
--- a/src/fauxton/assets/less/icons.less
+++ b/src/fauxton/assets/less/icons.less
@@ -18,11 +18,11 @@
 
 @font-face {
         font-family: "fauxtonicon";
-        src: url("../img/fauxtonicon.eot");
-        src: url("../img/fauxtonicon.eot?#iefix") format("embedded-opentype"),
-        url("../img/fauxtonicon.woff") format("woff"),
-        url("../img/fauxtonicon.ttf") format("truetype"),
-        url("../img/fauxtonicon.svg#fauxtonicon") format("svg");
+        src: url("../fonts/fauxtonicon.eot");
+        src: url("../fonts/fauxtonicon.eot?#iefix") format("embedded-opentype"),
+        url("../fonts/fauxtonicon.woff") format("woff"),
+        url("../fonts/fauxtonicon.ttf") format("truetype"),
+        url("../fonts/fauxtonicon.svg#fauxtonicon") format("svg");
         font-weight: normal;
         font-style: normal;
     }
@@ -30,7 +30,7 @@
     @media screen and (-webkit-min-device-pixel-ratio:0) {
         @font-face {
             font-family: "fauxtonicon";
-            src: url("../img/fauxtonicon.svg#fauxtonicon") format("svg");
+            src: url("../fonts/fauxtonicon.svg#fauxtonicon") format("svg");
         }
     }
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/couchserver.js b/src/fauxton/tasks/couchserver.js
index e1f18f9..ffbf362 100644
--- a/src/fauxton/tasks/couchserver.js
+++ b/src/fauxton/tasks/couchserver.js
@@ -55,6 +55,8 @@ module.exports = function (grunt) {
         filePath = path.join('./',url);
       } 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);
       } else if (!!url.match(/\.css|img/)) {
         filePath = path.join(dist_dir,url);
       /*} else if (!!url.match(/\/js\//)) {


Mime
View raw message