Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@couchdb.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: deathbear@apache.org
To: commits@couchdb.apache.org
Date: Wed, 11 Sep 2013 15:26:28 -0000
Message-Id: <4bb92d08645f485eba5c2d0f6c6ff45a@git.apache.org>
In-Reply-To: <e28b1bb52af24e0da4ae1925d5aa86d6@git.apache.org>
References: <e28b1bb52af24e0da4ae1925d5aa86d6@git.apache.org>
Subject: [3/3] git commit: updated refs/heads/master to 26f6a00

Adding Font-awesome icons


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

Branch: refs/heads/master
Commit: 26f6a00b8f440a0b671db47a27ccca3d792574d1
Parents: 2e506c0
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Tue Sep 10 17:02:13 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Wed Sep 11 11:26:15 2013 -0400

----------------------------------------------------------------------
 LICENSE                                         |  115 ++
 NOTICE                                          |    5 +
 src/fauxton/assets/img/FontAwesome.otf          |  Bin 0 -> 61896 bytes
 src/fauxton/assets/img/fontawesome-webfont.eot  |  Bin 0 -> 37405 bytes
 src/fauxton/assets/img/fontawesome-webfont.svg  |  399 ++++
 src/fauxton/assets/img/fontawesome-webfont.ttf  |  Bin 0 -> 79076 bytes
 src/fauxton/assets/img/fontawesome-webfont.woff |  Bin 0 -> 43572 bytes
 .../assets/less/bootstrap/bootstrap.less        |    2 +-
 .../less/bootstrap/font-awesome/bootstrap.less  |   84 +
 .../less/bootstrap/font-awesome/core.less       |  129 ++
 .../less/bootstrap/font-awesome/extras.less     |   93 +
 .../font-awesome/font-awesome-ie7.less          | 1953 ++++++++++++++++++
 .../bootstrap/font-awesome/font-awesome.less    |   33 +
 .../less/bootstrap/font-awesome/icons.less      |  381 ++++
 .../less/bootstrap/font-awesome/mixins.less     |   48 +
 .../less/bootstrap/font-awesome/path.less       |   14 +
 .../less/bootstrap/font-awesome/variables.less  |  735 +++++++
 src/fauxton/assets/less/database.less           |    4 -
 src/fauxton/assets/less/fauxton.less            |    3 -
 19 files changed, 3990 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/26f6a00b/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 5acc95e..4d4e662 100644
--- a/LICENSE
+++ b/LICENSE
@@ -980,3 +980,118 @@ for src/fauxton/js/libs/spin.js
   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
+
+
+for src/fauxton/assets/img/font-awesome.*
+
+SIL OPEN FONT LICENSE
+
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting — in part or in whole — any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+
+for src/fauxton/assets/less/bootstrap/font-awesome/*
+
+The MIT License (MIT)
+
+Copyright (c) 2013  Dave Gandy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/26f6a00b/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 9b61ccb..95d4ff6 100644
--- a/NOTICE
+++ b/NOTICE
@@ -161,3 +161,8 @@ This product also includes the following third-party components:
  * spin.js
 
    Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
+ 
+ * font-awesome http://fortawesome.github.io/Font-Awesome/
+
+   Copyright (c) 2013 Dave Gandy
+

http://git-wip-us.apache.org/repos/asf/couchdb/blob/26f6a00b/src/fauxton/assets/img/FontAwesome.otf
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/FontAwesome.otf b/src/fauxton/assets/img/FontAwesome.otf
new file mode 100644
index 0000000..7012545
Binary files /dev/null and b/src/fauxton/assets/img/FontAwesome.otf differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/26f6a00b/src/fauxton/assets/img/fontawesome-webfont.eot
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/fontawesome-webfont.eot b/src/fauxton/assets/img/fontawesome-webfont.eot
new file mode 100755
index 0000000..0662cb9
Binary files /dev/null and b/src/fauxton/assets/img/fontawesome-webfont.eot differ