couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [51/51] [abbrv] fauxton commit: updated refs/heads/Update-Sidebar to c713f63
Date Tue, 22 Jul 2014 07:32:50 GMT
Fix Fonts

updated path to reflect new repo ('couchdb-fauxton') and added select-all and deselect-all
svg icons


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

Branch: refs/heads/Update-Sidebar
Commit: c713f6336e55d2e7dcbf7762fe844ceec1026aee
Parents: a1d1f52 b09dba4
Author: sean barclay <fudd1011@hotmail.com>
Authored: Tue Jul 22 09:29:27 2014 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Tue Jul 22 09:30:31 2014 +0200

----------------------------------------------------------------------
 assets/fonts/README.md                          |  10 +
 assets/fonts/fauxtonicon.svg                    | 351 +++++++++++++
 assets/fonts/fontcustom.yml                     |  12 +
 .../fonts/styleguide/fauxtonicon-preview.html   | 516 +++++++++++++++++++
 assets/icons/deselect-all.svg                   |  15 +
 assets/icons/select-all.svg                     |  11 +
 assets/less/icons.less                          | 109 +++-
 7 files changed, 1023 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c713f633/assets/fonts/README.md
----------------------------------------------------------------------
diff --cc assets/fonts/README.md
index 7deb80d,27311ca..855842e
--- a/assets/fonts/README.md
+++ b/assets/fonts/README.md
@@@ -10,7 -10,7 +10,11 @@@ Requires **Bundler.io**, **Ruby 1.9.2+*
  # On Mac
  $ gem install bundler
  $ brew install fontforge eot-utils
++<<<<<<< HEAD
 +$ cd [LOCAL_COUCHDB_REPO]/src/fauxton/assets/fonts
++=======
+ $ cd [LOCAL_COUCHDB_REPO]/src/couchdb-fauxton/assets/fonts
++>>>>>>> pr/11
  $ bundle
  ```
  
@@@ -22,9 -22,9 +26,15 @@@ Don't forget to update `fontcustom.yml
  From there, you can run the command `$ fontcustom compile` to compile the svgs located in
the ./icons directory into updated fauxtonicon font files. 
  
  It's setup to generate the following 
++<<<<<<< HEAD
 +- an `icons.less` file [LOCAL_COUCHDB_REPO]/src/fauxton/assets/less
 +- a `fauxtonicon-preview.html` preview [LOCAL_COUCHDB_REPO]/src/fauxton/assets/fonts/styleguide
 +- font files in [LOCAL_COUCHDB_REPO]/src/fauxton/assets/fonts/
++=======
+ - an `icons.less` file [LOCAL_COUCHDB_REPO]/src/couchdb-fauxton/assets/less
+ - a `fauxtonicon-preview.html` preview [LOCAL_COUCHDB_REPO]/src/couchdb-fauxton/assets/fonts/styleguide
+ - font files in [LOCAL_COUCHDB_REPO]/src/couchdb-fauxton/assets/fonts/
++>>>>>>> pr/11
    * `fauxtonicon.eot` 
    * `fauxtonicon.svg`
    * `fauxtonicon.ttf`


Mime
View raw message