diff --git a/README.md b/README.md index 159ea66..6895566 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,21 @@ -### Typicons +Typicons +---- -Version 2.0.1 of Typicons, including source SVG files and the Fontello script used to generate the font files. Visit the [website](http://typicons.com/) for information on how to use Typicons on your website, a decription of how the font was made and more resources. +Visit the [website](http://typicons.com/) for information on how to use Typicons on your website, a decription of how the font was made and more resources. If you wish to contact me regarding Typicons you can hit me up on [Twitter](http://twitter.com/typicons/). -If you wish to contact me regarding Typicons you can hit me up on [Twitter](http://twitter.com/typicons/). +Using Typicons +---- Typicons can now be easily installed with [bower](http://www.bower.io/). -``` -bower install typicons +```bash +$ bower install typicons ``` +Otherwise, the font and minified CSS can be found in [src/font/](https://github.com/stephenhutchings/typicons.font/tree/master/src/font). + +SVG source files can be found in [src/svg/](https://github.com/stephenhutchings/typicons.font/tree/master/src/svg). + Info ---- @@ -51,21 +57,19 @@ What's new in Typicons License ------- -### Icons, font - -Artwork (and original font) by Stephen Hutchings: - -- [website](http://typicons.com/) -- [twitter](http://twitter.com/typicons/) +#### Icons/Artwork Distributed under [CC BY-SA](http://creativecommons.org/licenses/by-sa/3.0/) licence. -### Scripting +#### Font -This project uses [font-builder](https://github.com/fontello/font-builder) scripts to generate data. See DEVELOPMENT.MD for more information on how to build the font. +Distributed under +[SIL Open Font Licence](http://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web) licence. +Other +------- + +#### Scripting -### To Do -- Batch creation of EPS, PNG and CSS files, as well as archive ZIP -- Add search queries to the CONFIG +This project uses [font-builder](https://github.com/fontello/font-builder) scripts to generate data. See DEVELOPMENT.MD for more information on how to build the font. diff --git a/bower.json b/bower.json index 0d0bb35..deb2432 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "typicons.font", - "version": "2.0.3", + "version": "2.0.4", "main": [ "src/font/demo.html", "src/font/typicons.eot", @@ -8,9 +8,10 @@ "src/font/typicons.woff", "src/font/typicons.svg", "src/font/typicons.min.css" + "src/font/LICENCE.md" ], "authors": [ - "Stephen Hutchings " + "Stephen Hutchings " ], "description": "Typicons are free-to-use vector icons embedded in a webfont for easy use in your user interfaces, whether it be on the web or in a native application.", "keywords": [ @@ -32,5 +33,5 @@ "*.md" ], "homepage": "http://typicons.com/", - "license": "CC BY-SA" + "license": "CC BY-SA / SIL" } diff --git a/src/font/LICENCE.md b/src/font/LICENCE.md new file mode 100644 index 0000000..2169628 --- /dev/null +++ b/src/font/LICENCE.md @@ -0,0 +1,92 @@ +Copyright (c) 2014, Stephen Hutchings (http://www.s-ings.com/). + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + +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.