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:46 UTC
[30/39] couchdb commit: updated refs/heads/Update-Sidebar-Ui to
2cf2eab
updated fontcustom to compile to "/fonts" directory vs "/img"
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5a3d95ee
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5a3d95ee
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5a3d95ee
Branch: refs/heads/Update-Sidebar-Ui
Commit: 5a3d95ee74600d39137cd26eded8229004136991
Parents: a4eb455
Author: sean barclay <fu...@hotmail.com>
Authored: Tue Jun 10 08:51:14 2014 -0700
Committer: sean barclay <fu...@hotmail.com>
Committed: Tue Jun 10 08:51:14 2014 -0700
----------------------------------------------------------------------
src/fauxton/Gruntfile.js | 4 +
src/fauxton/assets/fonts/FontAwesome.otf | Bin 0 -> 61896 bytes
src/fauxton/assets/fonts/README.md | 120 ++++
src/fauxton/assets/fonts/fauxtonicon.eot | Bin 0 -> 17280 bytes
src/fauxton/assets/fonts/fauxtonicon.svg | 642 +++++++++++++++++++
src/fauxton/assets/fonts/fauxtonicon.ttf | Bin 0 -> 17092 bytes
src/fauxton/assets/fonts/fauxtonicon.woff | Bin 0 -> 9872 bytes
.../assets/fonts/fontawesome-webfont.eot | Bin 0 -> 37405 bytes
.../assets/fonts/fontawesome-webfont.svg | 399 ++++++++++++
.../assets/fonts/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes
.../assets/fonts/fontawesome-webfont.woff | Bin 0 -> 43572 bytes
.../fonts/styleguide/fauxtonicon-preview.html | 12 +-
src/fauxton/assets/fonts/templates/icons.less | 4 +-
src/fauxton/assets/icons/README.md | 120 ----
src/fauxton/assets/icons/fontcustom.yml | 6 +-
src/fauxton/assets/img/FontAwesome.otf | Bin 61896 -> 0 bytes
src/fauxton/assets/img/fauxtonicon.eot | Bin 17276 -> 0 bytes
src/fauxton/assets/img/fauxtonicon.svg | 642 -------------------
src/fauxton/assets/img/fauxtonicon.ttf | Bin 17088 -> 0 bytes
src/fauxton/assets/img/fauxtonicon.woff | Bin 9872 -> 0 bytes
src/fauxton/assets/img/fontawesome-webfont.eot | Bin 37405 -> 0 bytes
src/fauxton/assets/img/fontawesome-webfont.svg | 399 ------------
src/fauxton/assets/img/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes
src/fauxton/assets/img/fontawesome-webfont.woff | Bin 43572 -> 0 bytes
src/fauxton/assets/less/icons.less | 12 +-
src/fauxton/tasks/couchserver.js | 2 +
26 files changed, 1185 insertions(+), 1177 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index 8ffb2f8..51ab26b 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -64,6 +64,7 @@ module.exports = function(grunt) {
"dist/debug/css/fauxton.css": "assets/less/fauxton.less"
}
},
+ fonts: ["assets/fonts/*"],
img: ["assets/img/**"],
// used in concat:index_css to keep file ordering intact
// fauxton.css should load first
@@ -324,6 +325,7 @@ module.exports = function(grunt) {
{src: "dist/release/index.html", dest: "../../share/www/fauxton/index.html"},
{src: ["**"], dest: "../../share/www/fauxton/js/", cwd:'dist/release/js/', expand: true},
{src: ["**"], dest: "../../share/www/fauxton/img/", cwd:'dist/release/img/', expand: true},
+ {src: ["**"], dest: "../../share/www/fauxton/fonts/", cwd:'dist/release/fonts/', expand: true},
{src: ["**"], dest: "../../share/www/fauxton/css/", cwd:"dist/release/css/", expand: true}
]
},
@@ -333,6 +335,7 @@ module.exports = function(grunt) {
{src: "dist/debug/index.html", dest: "../../share/www/fauxton/index.html"},
{src: ["**"], dest: "../../share/www/fauxton/js/", cwd:'dist/debug/js/', expand: true},
{src: ["**"], dest: "../../share/www/fauxton/img/", cwd:'dist/debug/img/', expand: true},
+ {src: ["**"], dest: "../../share/www/fauxton/fonts/", cwd:'dist/debug/fonts/', expand: true},
{src: ["**"], dest: "../../share/www/fauxton/css/", cwd:"dist/debug/css/", expand: true}
]
},
@@ -354,6 +357,7 @@ module.exports = function(grunt) {
},
debug:{
files:[
+ {src: assets.fonts, dest: "dist/debug/fonts/", flatten: true, expand: true},
{src: assets.img, dest: "dist/debug/img/", flatten: true, expand: true}
]
}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/fonts/FontAwesome.otf
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/FontAwesome.otf b/src/fauxton/assets/fonts/FontAwesome.otf
new file mode 100644
index 0000000..7012545
Binary files /dev/null and b/src/fauxton/assets/fonts/FontAwesome.otf differ
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5a3d95ee/src/fauxton/assets/fonts/README.md
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/README.md b/src/fauxton/assets/fonts/README.md
new file mode 100644
index 0000000..75f1acc
--- /dev/null
+++ b/src/fauxton/assets/fonts/README.md
@@ -0,0 +1,120 @@
+*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/fonts/fauxtonicon.eot
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/fonts/fauxtonicon.eot b/src/fauxton/assets/fonts/fauxtonicon.eot
new file mode 100644
index 0000000..66ea129
Binary files /dev/null and b/src/fauxton/assets/fonts/fauxtonicon.eot differ