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/06/11 14:56:42 UTC
[26/39] updated fontcustom to compile to "/fonts" directory vs "/img"
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/fonts/fontawesome-webfont.woff
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/fontawesome-webfont.woff b/src/fauxton/assets/fonts/fontawesome-webfont.woff
new file mode 100755
index 0000000..b9bd17e
Binary files /dev/null and b/src/fauxton/assets/fonts/fontawesome-webfont.woff differ
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/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 a289785..84ec561 100644
--- a/src/fauxton/assets/fonts/styleguide/fauxtonicon-preview.html
+++ b/src/fauxton/assets/fonts/styleguide/fauxtonicon-preview.html
@@ -141,11 +141,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("../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;
}
@@ -153,7 +153,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("../fauxtonicon.svg#fauxtonicon") format("svg");
}
}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/fonts/templates/icons.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/templates/icons.less b/src/fauxton/assets/fonts/templates/icons.less
index 16c4d58..f4e8dbd 100644
--- a/src/fauxton/assets/fonts/templates/icons.less
+++ b/src/fauxton/assets/fonts/templates/icons.less
@@ -15,7 +15,9 @@
* 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(:LESS) %>
[data-icon]:before { content: attr(data-icon); }
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/icons/README.md
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/icons/README.md b/src/fauxton/assets/icons/README.md
deleted file mode 100644
index 75f1acc..0000000
--- a/src/fauxton/assets/icons/README.md
+++ /dev/null
@@ -1,120 +0,0 @@
-*WARNING: this is a temporary solution for adding icons to the Icon Font. This will become a grunt task eventually.*
-
-
-[](http://badge.fury.io/rb/fontcustom)
-[](https://travis-ci.org/FontCustom/fontcustom)
-[](https://codeclimate.com/github/FontCustom/fontcustom)
-
-## Font Custom
-
-**Icon fonts from the command line.**
-
-Generate cross-browser icon fonts and supporting files (@font-face CSS, etc.) from a collection of SVGs.
-
-[Changelog](https://github.com/FontCustom/fontcustom/blob/master/CHANGELOG.md)<br>
-[Bugs/Support](https://github.com/FontCustom/fontcustom/issues)<br>
-[Contribute!](https://github.com/FontCustom/fontcustom/blob/master/CONTRIBUTING.md)
-
-### Installation
-
-Requires **Ruby 1.9.2+**, **FontForge** with Python scripting.
-
-```sh
-# On Mac
-brew install fontforge eot-utils
-gem install fontcustom
-
-# On Linux
-sudo apt-get install fontforge
-wget http://people.mozilla.com/~jkew/woff/woff-code-latest.zip
-unzip woff-code-latest.zip -d sfnt2woff && cd sfnt2woff && make && sudo mv sfnt2woff /usr/local/bin/
-gem install fontcustom
-```
-
-### Quick Start
-
-```sh
-fontcustom compile path/to/vectors # Compiles icons into `fontcustom/`
-fontcustom watch path/to/vectors # Compiles when vectors are changed/added/removed
-fontcustom compile # Uses configuration file at `fontcustom.yml`
- # or `config/fontcustom.yml`
-fontcustom config # Generate a blank a configuration file
-fontcustom help # See all options
-```
-
-### Configuration
-
-To preserve options between compiles, create a configuration file with
-`fontcustom config`. This should live in the directory where you run
-all `fontcustom` commands. Each of the following has its own command
-line flag (`--css-selector`, etc.). Defaults values are shown.
-
-**Basics**
-
-```yml
-project_root: (pwd) # Context for all relative paths
-input: (project_root) # Where vectors and templates are located
-output: (project_root)/(font name) # Where generated files will be saved
-config: (pwd)/fontcustom.yml # Optional path to a configuration file
-debug: false # Output raw messages from fontforge
-quiet: false # Silence all messages except errors
-
-# For more control over file locations, set
-# input and output as hashes instead of strings
-input:
- vectors: path/to/vectors # required
- templates: path/to/templates
-
-output:
- fonts: app/assets/fonts # required
- css: app/assets/stylesheets
- preview: app/views/styleguide
-```
-
-**Fonts**
-
-```yml
-font_name: fontcustom # Also sets the default output directory and
- # the name of generated stock templates
-no_hash: false # Don't add asset-busting hashes to font files
-autowidth: false # Automatically size glyphs based on the width of
- # their individual vectors
-```
-
-**Templates**
-
-```yml
-templates: [ css, preview ] # List of templates to generate alongside fonts
- # Possible values: preview, css, scss, scss-rails
-css_selector: .icon-{{glyph}} # CSS selector format (`{{glyph}}` is replaced)
-preprocessor_path: "" # Font path used in CSS proprocessor templates
- # Set to "" or false to use the bare font name
-
-# Custom templates should live in the `input`
-# or `input[:templates]` directory and be added
-# to `templates` as their basename:
-templates: [ preview, VectorIcons.less ]
-```
-
-Custom templates have access to `@options`, `@manifest`, and the following ERB helpers:
-
-* `font_name`
-* `font_face`: FontSpring's [Bulletproof @font-face syntax](http://www.fontspring.com/blog/further-hardening-of-the-bulletproof-syntax)
-* `glyph_selectors`: comma-separated list of all selectors
-* `glyphs`: all selectors and their codepoint assignments (`.icon-example:before { content: "\f103"; }`)
-
-### SVG Guidelines
-
-* All colors will be rendered identically — including white fills.
-* Make transparent colors solid. SVGs with transparency will be skipped.
-* For greater precision, prefer fills to strokes (especially if your icon includes curves).
-* Keep your icon within a square `viewBox`. Font Custom scales each SVG to fit
- a 512x512 canvas with a baseline at 448.
-* Setting `autowidth` to true trims horizontal white space from each glyph. This can be much easier
- than centering dozens of SVGs by hand.
-
----
-
-[Licenses](https://github.com/FontCustom/fontcustom/blob/master/LICENSES.txt)
-
-Brought to you by [@endtwist](https://github.com/endtwist) and [@ezYZ](https://github.com/ezYZ)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/icons/fontcustom.yml
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/icons/fontcustom.yml b/src/fauxton/assets/icons/fontcustom.yml
index 116f70c..b92677b 100644
--- a/src/fauxton/assets/icons/fontcustom.yml
+++ b/src/fauxton/assets/icons/fontcustom.yml
@@ -6,7 +6,7 @@
font_name: fauxtonicon
css_selector: .fonticon-{{glyph}}
-preprocessor_path: "../img/"
+preprocessor_path: "../fonts/"
autowidth: false
no_hash: true
force: false
@@ -28,7 +28,7 @@ input:
# --------------------------------------------------------------------------- #
output:
- fonts: PUT_YOUR_PATH_HERE/fauxton/assets/img # required
+ 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
@@ -48,4 +48,4 @@ templates:
- icons.less
# FYI... KNOWN ISSUE: https://github.com/FontCustom/fontcustom/issues/172.
-# TEMP SOLUTION W/ PATH FIX: https://github.com/skirchmeier/fontcustom/tree/master
\ No newline at end of file
+# TEMP SOLUTION W/ PATH FIX: https://github.com/skirchmeier/fontcustom/tree/master
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/img/FontAwesome.otf
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/FontAwesome.otf b/src/fauxton/assets/img/FontAwesome.otf
deleted file mode 100644
index 7012545..0000000
Binary files a/src/fauxton/assets/img/FontAwesome.otf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/img/fauxtonicon.eot
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/fauxtonicon.eot b/src/fauxton/assets/img/fauxtonicon.eot
deleted file mode 100644
index 40b527d..0000000
Binary files a/src/fauxton/assets/img/fauxtonicon.eot and /dev/null differ