couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [31/39] couchdb commit: updated refs/heads/Update-Sidebar-Ui to 2cf2eab
Date Wed, 11 Jun 2014 12:56:47 GMT
Oh the lengths i go to make compiling fonts easier...
Added a Gemfile to point to my github fork of font custom, which fixes some of the bugs and
sets up the custom template use better.


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

Branch: refs/heads/Update-Sidebar-Ui
Commit: fa945930de84344cbbff0fd1c2fa59066086c40f
Parents: 5a3d95e
Author: sean barclay <fudd1011@hotmail.com>
Authored: Tue Jun 10 12:29:01 2014 -0700
Committer: sean barclay <fudd1011@hotmail.com>
Committed: Tue Jun 10 12:29:01 2014 -0700

----------------------------------------------------------------------
 src/fauxton/assets/fonts/Gemfile                |   5 ++
 src/fauxton/assets/fonts/Gemfile.lock           |  31 ++++++++++
 src/fauxton/assets/fonts/fauxtonicon.eot        | Bin 17280 -> 17280 bytes
 src/fauxton/assets/fonts/fauxtonicon.svg        |   6 +-
 src/fauxton/assets/fonts/fauxtonicon.ttf        | Bin 17092 -> 17092 bytes
 src/fauxton/assets/fonts/fauxtonicon.woff       | Bin 9872 -> 9876 bytes
 src/fauxton/assets/fonts/fontcustom.yml         |  51 ++++++++++++++++
 .../fonts/styleguide/fauxtonicon-preview.html   |  58 +++++++++---------
 src/fauxton/assets/icons/fontcustom.yml         |  51 ----------------
 src/fauxton/assets/less/icons.less              |  60 ++++++++++---------
 10 files changed, 150 insertions(+), 112 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/fonts/Gemfile
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/Gemfile b/src/fauxton/assets/fonts/Gemfile
new file mode 100644
index 0000000..3f6dd8a
--- /dev/null
+++ b/src/fauxton/assets/fonts/Gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'fontcustom', 
+:git => 'https://github.com/seanbarclay/fontcustom.git', 
+:branch => 'master'
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/fonts/Gemfile.lock
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/Gemfile.lock b/src/fauxton/assets/fonts/Gemfile.lock
new file mode 100644
index 0000000..bdee8ac
--- /dev/null
+++ b/src/fauxton/assets/fonts/Gemfile.lock
@@ -0,0 +1,31 @@
+GIT
+  remote: https://github.com/seanbarclay/fontcustom.git
+  revision: 1c3ad3d2633d3a8add39e8827115394e9ec02d88
+  branch: master
+  specs:
+    fontcustom (1.3.3)
+      json (~> 1.4)
+      listen (~> 1.0)
+      thor (~> 0.14)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ffi (1.9.3)
+    json (1.8.1)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.3)
+      ffi (>= 0.5.0)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fontcustom!

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/fonts/fauxtonicon.eot
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/fauxtonicon.eot b/src/fauxton/assets/fonts/fauxtonicon.eot
index 66ea129..b3768dd 100644
Binary files a/src/fauxton/assets/fonts/fauxtonicon.eot and b/src/fauxton/assets/fonts/fauxtonicon.eot
differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/fonts/fauxtonicon.svg
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/fauxtonicon.svg b/src/fauxton/assets/fonts/fauxtonicon.svg
index 9abb9eb..8e1e0da 100644
--- a/src/fauxton/assets/fonts/fauxtonicon.svg
+++ b/src/fauxton/assets/fonts/fauxtonicon.svg
@@ -5,7 +5,7 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Tue Jun 10 07:32:28 2014
+Created by FontForge 20120731 at Tue Jun 10 12:19:43 2014
  By Sean Barclay
 Created by Sean Barclay with FontForge 2.0 (http://fontforge.sf.net)
 </metadata>
@@ -22,7 +22,7 @@ Created by Sean Barclay with FontForge 2.0 (http://fontforge.sf.net)
     bbox="-0.0730828 -64.6562 516.096 448.515"
     underline-thickness="25.6"
     underline-position="-51.2"
-    unicode-range="U+F100-F172"
+    unicode-range="U+F101-F173"
   />
     <missing-glyph />
     <glyph glyph-name="uniF108" unicode="&#xf108;" 
@@ -113,7 +113,7 @@ c-8.87435 8.87435 -19.6263 13.3115 -32.2559 13.3115h-237.568c-12.6289
0 -23.3809
 c9.21615 -9.21549 19.9681 -13.6527 32.2559 -13.3115h237.568c12.6296 0 23.3815 4.43717 32.2559
13.3115c8.875 8.875 13.3125 19.7979 13.3125 32.7686zM402.432 329.728v-237.567c0 -22.8691 -8.02116
-42.3252 -24.0635 -58.3682
 c-16.043 -16.043 -35.499 -24.0645 -58.3682 -24.0645h-237.568c-22.8691 0 -42.3249 8.02148
-58.3672 24.0645c-16.043 16.043 -24.0645 35.499 -24.0645 58.3682v237.567c0 22.528 8.02148
41.8135 24.0645 57.8564c16.0423 16.043 35.498 24.235 58.3672 24.5762
 h237.568c22.528 0 41.984 -8.19206 58.3682 -24.5762s24.4053 -35.6696 24.0635 -57.8564z" />
-    <glyph glyph-name="uniF100" unicode="&#xf100;" 
+    <glyph glyph-name="uniF173" unicode="&#xf173;" 
 d="M292.352 46.0801h183.297v36.8643h-183.297v-36.8643zM182.784 192.512h292.864v36.3525h-292.864v-36.3525zM365.568
338.944h110.08v36.3516h-110.08v-36.3516zM512 100.864v-72.7041c0 -5.11979 -1.87728 -9.38639
-5.63184 -12.7998
 c-3.75456 -3.41341 -8.02116 -5.29102 -12.7998 -5.63281h-475.137c-5.11979 0 -9.38639 1.8776
-12.7998 5.63281c-3.41341 3.75456 -5.29069 8.02116 -5.63184 12.7998v72.7041c0 5.11979 1.87728
9.55697 5.63184 13.3115
 c3.75456 3.75456 8.02116 5.46126 12.7998 5.12012h475.137c5.11979 0 9.38639 -1.70671 12.7998
-5.12012s5.29069 -7.85059 5.63184 -13.3115zM512 247.296v-73.2158c0 -4.77865 -1.87728 -9.04525
-5.63184 -12.7998s-8.02116 -5.46126 -12.7998 -5.12012h-475.137

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/fonts/fauxtonicon.ttf
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/fauxtonicon.ttf b/src/fauxton/assets/fonts/fauxtonicon.ttf
index 75f28d2..f1039f2 100644
Binary files a/src/fauxton/assets/fonts/fauxtonicon.ttf and b/src/fauxton/assets/fonts/fauxtonicon.ttf
differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/fonts/fauxtonicon.woff
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/fauxtonicon.woff b/src/fauxton/assets/fonts/fauxtonicon.woff
index 0a3f4d5..95e0af1 100644
Binary files a/src/fauxton/assets/fonts/fauxtonicon.woff and b/src/fauxton/assets/fonts/fauxtonicon.woff
differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/fonts/fontcustom.yml
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/fontcustom.yml b/src/fauxton/assets/fonts/fontcustom.yml
new file mode 100644
index 0000000..b92677b
--- /dev/null
+++ b/src/fauxton/assets/fonts/fontcustom.yml
@@ -0,0 +1,51 @@
+# --------------------------------------------------------------------------- #
+# Project Info
+#   Defaults shown. Learn more about these options by running
+#   `fontcustom help` or visiting <http://fontcustom.com>.
+# --------------------------------------------------------------------------- #
+
+font_name: fauxtonicon
+css_selector: .fonticon-{{glyph}}
+preprocessor_path: "../fonts/"
+autowidth: false
+no_hash: true
+force: false
+debug: true
+quiet: false
+
+
+# --------------------------------------------------------------------------- #
+# Input Paths
+# --------------------------------------------------------------------------- #
+
+input:
+  vectors: PUT_YOUR_PATH_HERE/fauxton/assets/icons         # required
+  templates: PUT_YOUR_PATH_HERE/fauxton/assets/fonts/templates
+
+
+# --------------------------------------------------------------------------- #
+# Output Paths
+# --------------------------------------------------------------------------- #
+
+output:
+  fonts: PUT_YOUR_PATH_HERE/fauxton/assets/fonts                              # required
+  # css: PUT_YOUR_PATH_HERE/fauxton/assets/less
+  preview: PUT_YOUR_PATH_HERE/fauxton/assets/fonts/styleguide
+  icons.less: PUT_YOUR_PATH_HERE/fauxton/assets/less 
+  #my-custom-template.yml: path/to/template/output
+
+
+# --------------------------------------------------------------------------- #
+# Templates
+#   Included in Font Custom: preview, css, scss, scss-rails
+#   Custom templates should be saved in the INPUT[:templates] directory and
+#   referenced by their baserame.
+# --------------------------------------------------------------------------- #
+
+templates:
+ # - css
+ - preview
+ - icons.less
+
+# FYI... KNOWN ISSUE: https://github.com/FontCustom/fontcustom/issues/172.
+# TEMP SOLUTION W/ PATH FIX: https://github.com/skirchmeier/fontcustom/tree/master

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/fonts/styleguide/fauxtonicon-preview.html
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/styleguide/fauxtonicon-preview.html b/src/fauxton/assets/fonts/styleguide/fauxtonicon-preview.html
index 84ec561..3bbe493 100644
--- a/src/fauxton/assets/fonts/styleguide/fauxtonicon-preview.html
+++ b/src/fauxton/assets/fonts/styleguide/fauxtonicon-preview.html
@@ -140,22 +140,22 @@
       /* Icon Font: fauxtonicon */
 
       @font-face {
-        font-family: "fauxtonicon";
-        src: url("../fauxtonicon.eot");
-        src: url("../fauxtonicon.eot?#iefix") format("embedded-opentype"),
-        url("../fauxtonicon.woff") format("woff"),
-        url("../fauxtonicon.ttf") format("truetype"),
-        url("../fauxtonicon.svg#fauxtonicon") format("svg");
-        font-weight: normal;
-        font-style: normal;
-    }
-    
-    @media screen and (-webkit-min-device-pixel-ratio:0) {
-        @font-face {
-            font-family: "fauxtonicon";
-            src: url("../fauxtonicon.svg#fauxtonicon") format("svg");
-        }
-    }
+  font-family: "fauxtonicon";
+  src: url("../fauxtonicon.eot");
+  src: url("../fauxtonicon.eot?#iefix") format("embedded-opentype"),
+       url("../fauxtonicon.woff") format("woff"),
+       url("../fauxtonicon.ttf") format("truetype"),
+       url("../fauxtonicon.svg#fauxtonicon") format("svg");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  @font-face {
+    font-family: "fauxtonicon";
+    src: url("../fauxtonicon.svg#fauxtonicon") format("svg");
+  }
+}
 
       [data-icon]:before { content: attr(data-icon); }
 
@@ -276,20 +276,20 @@
 .fonticon-wrench:before,
 .fonticon-x:before {
         display: inline-block;
-    font-family: "fauxtonicon";
-    font-style: normal;
-    font-weight: normal;
-    font-variant: normal;
-    line-height: 1;
-    text-decoration: inherit;
-    text-rendering: optimizeLegibility;
-    text-transform: none;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-smoothing: antialiased;
-    font-smoothing: antialiased;
+  font-family: "fauxtonicon";
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  line-height: 1;
+  text-decoration: inherit;
+  text-rendering: optimizeLegibility;
+  text-transform: none;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  font-smoothing: antialiased;
       }
 
-      .fonticon-activetasks:before { content: "\f100"; }
+      .fonticon-activetasks:before { content: "\f173"; }
 .fonticon-arrow-box-down:before { content: "\f101"; }
 .fonticon-arrow-box-up:before { content: "\f102"; }
 .fonticon-arrow_left:before { content: "\f103"; }
@@ -433,7 +433,7 @@
         </div>
         <div class="usage">
           <input class="class" type="text" readonly="readonly" onClick="this.select();"
value=".fonticon-activetasks" />
-          <input class="point" type="text" readonly="readonly" onClick="this.select();"
value="&amp;#xf100;" />
+          <input class="point" type="text" readonly="readonly" onClick="this.select();"
value="&amp;#xf173;" />
         </div>
       </div>
       

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/icons/fontcustom.yml
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/icons/fontcustom.yml b/src/fauxton/assets/icons/fontcustom.yml
deleted file mode 100644
index b92677b..0000000
--- a/src/fauxton/assets/icons/fontcustom.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# --------------------------------------------------------------------------- #
-# Project Info
-#   Defaults shown. Learn more about these options by running
-#   `fontcustom help` or visiting <http://fontcustom.com>.
-# --------------------------------------------------------------------------- #
-
-font_name: fauxtonicon
-css_selector: .fonticon-{{glyph}}
-preprocessor_path: "../fonts/"
-autowidth: false
-no_hash: true
-force: false
-debug: true
-quiet: false
-
-
-# --------------------------------------------------------------------------- #
-# Input Paths
-# --------------------------------------------------------------------------- #
-
-input:
-  vectors: PUT_YOUR_PATH_HERE/fauxton/assets/icons         # required
-  templates: PUT_YOUR_PATH_HERE/fauxton/assets/fonts/templates
-
-
-# --------------------------------------------------------------------------- #
-# Output Paths
-# --------------------------------------------------------------------------- #
-
-output:
-  fonts: PUT_YOUR_PATH_HERE/fauxton/assets/fonts                              # required
-  # css: PUT_YOUR_PATH_HERE/fauxton/assets/less
-  preview: PUT_YOUR_PATH_HERE/fauxton/assets/fonts/styleguide
-  icons.less: PUT_YOUR_PATH_HERE/fauxton/assets/less 
-  #my-custom-template.yml: path/to/template/output
-
-
-# --------------------------------------------------------------------------- #
-# Templates
-#   Included in Font Custom: preview, css, scss, scss-rails
-#   Custom templates should be saved in the INPUT[:templates] directory and
-#   referenced by their baserame.
-# --------------------------------------------------------------------------- #
-
-templates:
- # - css
- - preview
- - icons.less
-
-# FYI... KNOWN ISSUE: https://github.com/FontCustom/fontcustom/issues/172.
-# TEMP SOLUTION W/ PATH FIX: https://github.com/skirchmeier/fontcustom/tree/master

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fa945930/src/fauxton/assets/less/icons.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/icons.less b/src/fauxton/assets/less/icons.less
index fcc7529..5ef53b0 100644
--- a/src/fauxton/assets/less/icons.less
+++ b/src/fauxton/assets/less/icons.less
@@ -15,24 +15,26 @@
  *  the License.
  */
 
-
+/* had to add a custom template to the generator to get this to compile to append the proper
path and specify  "url" instead of "font-url":
+https://github.com/seanbarclay/fontcustom/blob/1c3ad3d2633d3a8add39e8827115394e9ec02d88/lib/fontcustom/generator/template.rb
+*/
 @font-face {
-        font-family: "fauxtonicon";
-        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;
-    }
-    
-    @media screen and (-webkit-min-device-pixel-ratio:0) {
-        @font-face {
-            font-family: "fauxtonicon";
-            src: url("../fonts/fauxtonicon.svg#fauxtonicon") format("svg");
-        }
-    }
+  font-family: "fauxtonicon";
+  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;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  @font-face {
+    font-family: "fauxtonicon";
+    src: url("../fonts/fauxtonicon.svg#fauxtonicon") format("svg");
+  }
+}
 
 [data-icon]:before { content: attr(data-icon); }
 
@@ -153,20 +155,20 @@
 .fonticon-wrench:before,
 .fonticon-x:before {
   display: inline-block;
-    font-family: "fauxtonicon";
-    font-style: normal;
-    font-weight: normal;
-    font-variant: normal;
-    line-height: 1;
-    text-decoration: inherit;
-    text-rendering: optimizeLegibility;
-    text-transform: none;
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-smoothing: antialiased;
-    font-smoothing: antialiased;
+  font-family: "fauxtonicon";
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  line-height: 1;
+  text-decoration: inherit;
+  text-rendering: optimizeLegibility;
+  text-transform: none;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  font-smoothing: antialiased;
 }
 
-.fonticon-activetasks:before { content: "\f100"; }
+.fonticon-activetasks:before { content: "\f173"; }
 .fonticon-arrow-box-down:before { content: "\f101"; }
 .fonticon-arrow-box-up:before { content: "\f102"; }
 .fonticon-arrow_left:before { content: "\f103"; }


Mime
View raw message