Merge pull request #1100 from sergiors/master

Add npm support
This commit is contained in:
Dave Gandy 2013-05-16 17:24:43 -07:00
commit 8165d5c995
19 changed files with 2280 additions and 40 deletions

View file

@ -1,26 +1,29 @@
#Font Awesome 3.1.0
##the iconic font designed for Bootstrap
#[Font Awesome v3.1.1](http://fontawesome.io)
###the iconic font designed for Bootstrap
The full suite of pictographic icons, examples, documentation, and full license details can be found at:
http://fontawesome.io
Font Awesome is a full suite of 302 pictographic icons for easy scalable vector graphics on websites, created and
maintained by [Dave Gandy](http://twitter.com/byscuits). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
Get started at http://fontawesome.io!
##License
- The Font Awesome font is licensed under the SIL OFL 1.1 - http://scripts.sil.org/OFL
- Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - http://opensource.org/licenses/mit-license.html
- The Font Awesome documentation is licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
- Attribution is no longer required as of Font Awesome 3.0, but much appreciated: "Font Awesome by Dave Gandy - http://fontawesome.io"
##Contact
- Email: dave@fontawesome.io
- Twitter: http://twitter.com/fortaweso_me
- Work: Lead Product Designer @ http://kyru.us
- The Font Awesome font is licensed under the SIL OFL 1.1:
- http://scripts.sil.org/OFL
- Font Awesome CSS, LESS, and SASS files are licensed under the MIT License:
- http://opensource.org/licenses/mit-license.html
- The Font Awesome documentation is licensed under the CC BY 3.0 License:
- http://creativecommons.org/licenses/by/3.0/
- Attribution is no longer required as of Font Awesome 3.0, but much appreciated:
- `Font Awesome by Dave Gandy - http://fontawesome.io`
- Full details: http://fontawesome.io/license
##Changelog
- v3.0.0 - all icons redesigned from scratch, optimized for Bootstrap's 14px default
- v3.0.1 - much improved rendering in webkit, various bugfixes
- v3.0.2 - much improved rendering and alignment in IE7
- v3.1.0 - Added 54 icons, icon stacking styles, flipping and rotating icons, removed SASS support
- [v3.1.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=4&page=1&state=closed)
##Versioning
@ -34,4 +37,11 @@ And constructed with the following guidelines:
* New additions, including new icons, without breaking backward compatibility bumps the minor (and resets the patch)
* Bug fixes and misc changes bumps the patch
For more information on SemVer, please visit [http://semver.org/](http://semver.org/).
For more information on SemVer, please visit http://semver.org.
##Author
- Email: dave@fontawesome.io
- Twitter: http://twitter.com/byscuits
- GitHub: https://github.com/davegandy
- Work: Lead Product Designer @ http://kyru.us

View file

@ -16,10 +16,10 @@ icon_layout: icon.html # Relative to _layouts directory
icon_destination: icon # Relative to destination
font_awesome:
version: 3.1.0
version: 3.1.1
url: http://fontawesome.io
legacy_url: http://fortawesome.github.com/Font-Awesome/
twitter: fortaweso_me
twitter: fontawesome
author:
name: Dave Gandy
email: dave@fontawesome.io

View file

@ -280,6 +280,7 @@
<li><i class="icon-fixed-width">&#xf121;</i> icon-code <span class="muted">(&amp;#xf121;)</span></li>
<li><i class="icon-fixed-width">&#xf122;</i> icon-reply-all <span class="muted">(&amp;#xf122;)</span></li>
<li><i class="icon-fixed-width">&#xf122;</i> icon-mail-reply-all <span class="muted">(&amp;#xf122;)</span></li>
<li><i class="icon-fixed-width">&#xf123;</i> icon-star-half-full <span class="muted">(&amp;#xf123;)</span></li>
<li><i class="icon-fixed-width">&#xf123;</i> icon-star-half-empty <span class="muted">(&amp;#xf123;)</span></li>
<li><i class="icon-fixed-width">&#xf124;</i> icon-location-arrow <span class="muted">(&amp;#xf124;)</span></li>
<li><i class="icon-fixed-width">&#xf125;</i> icon-crop <span class="muted">(&amp;#xf125;)</span></li>

View file

@ -31,6 +31,7 @@
<div class="span3">
<ul class="the-icons">
<li><a href="{{ page.relative_path }}icon/star-half-empty"><i class="icon-star-half-empty"></i> icon-star-half-empty</a></li>
<li><a href="{{ page.relative_path }}icon/star-half-empty"><i class="icon-star-half-full"></i> icon-star-half-full <span class="muted">(alias)</span></a></li>
<li><a href="{{ page.relative_path }}icon/location-arrow"><i class="icon-location-arrow"></i> icon-location-arrow</a></li>
<li><a href="{{ page.relative_path }}icon/undo"><i class="icon-rotate-left"></i> icon-rotate-left <span class="muted">(alias)</span></a></li>
<li><a href="{{ page.relative_path }}icon/repeat"><i class="icon-rotate-right"></i> icon-rotate-right <span class="muted">(alias)</span></a></li>
@ -44,11 +45,11 @@
<li><a href="{{ page.relative_path }}icon/subscript"><i class="icon-subscript"></i> icon-subscript</a></li>
<li><a href="{{ page.relative_path }}icon/eraser"><i class="icon-eraser"></i> icon-eraser</a></li>
<li><a href="{{ page.relative_path }}icon/puzzle-piece"><i class="icon-puzzle-piece"></i> icon-puzzle-piece</a></li>
<li><a href="{{ page.relative_path }}icon/microphone"><i class="icon-microphone"></i> icon-microphone</a></li>
</ul>
</div>
<div class="span3">
<ul class="the-icons">
<li><a href="{{ page.relative_path }}icon/microphone"><i class="icon-microphone"></i> icon-microphone</a></li>
<li><a href="{{ page.relative_path }}icon/microphone-off"><i class="icon-microphone-off"></i> icon-microphone-off</a></li>
<li><a href="{{ page.relative_path }}icon/shield"><i class="icon-shield"></i> icon-shield</a></li>
<li><a href="{{ page.relative_path }}icon/calendar-empty"><i class="icon-calendar-empty"></i> icon-calendar-empty</a></li>

View file

@ -111,11 +111,11 @@
<li><a href="{{ page.relative_path }}icon/lightbulb"><i class="icon-lightbulb"></i> icon-lightbulb</a></li>
<li><a href="{{ page.relative_path }}icon/location-arrow"><i class="icon-location-arrow"></i> icon-location-arrow</a></li>
<li><a href="{{ page.relative_path }}icon/lock"><i class="icon-lock"></i> icon-lock</a></li>
<li><a href="{{ page.relative_path }}icon/magic"><i class="icon-magic"></i> icon-magic</a></li>
</ul>
</div>
<div class="span3">
<ul class="the-icons">
<li><a href="{{ page.relative_path }}icon/magic"><i class="icon-magic"></i> icon-magic</a></li>
<li><a href="{{ page.relative_path }}icon/magnet"><i class="icon-magnet"></i> icon-magnet</a></li>
<li><a href="{{ page.relative_path }}icon/share-alt"><i class="icon-mail-forward"></i> icon-mail-forward <span class="muted">(alias)</span></a></li>
<li><a href="{{ page.relative_path }}icon/reply"><i class="icon-mail-reply"></i> icon-mail-reply <span class="muted">(alias)</span></a></li>
@ -165,11 +165,11 @@
<li><a href="{{ page.relative_path }}icon/rocket"><i class="icon-rocket"></i> icon-rocket</a></li>
<li><a href="{{ page.relative_path }}icon/undo"><i class="icon-rotate-left"></i> icon-rotate-left <span class="muted">(alias)</span></a></li>
<li><a href="{{ page.relative_path }}icon/repeat"><i class="icon-rotate-right"></i> icon-rotate-right <span class="muted">(alias)</span></a></li>
<li><a href="{{ page.relative_path }}icon/rss-sign"><i class="icon-rss-sign"></i> icon-rss-sign</a></li>
</ul>
</div>
<div class="span3">
<ul class="the-icons">
<li><a href="{{ page.relative_path }}icon/rss-sign"><i class="icon-rss-sign"></i> icon-rss-sign</a></li>
<li><a href="{{ page.relative_path }}icon/rss"><i class="icon-rss"></i> icon-rss</a></li>
<li><a href="{{ page.relative_path }}icon/screenshot"><i class="icon-screenshot"></i> icon-screenshot</a></li>
<li><a href="{{ page.relative_path }}icon/search"><i class="icon-search"></i> icon-search</a></li>
@ -189,6 +189,7 @@
<li><a href="{{ page.relative_path }}icon/sort"><i class="icon-sort"></i> icon-sort</a></li>
<li><a href="{{ page.relative_path }}icon/spinner"><i class="icon-spinner"></i> icon-spinner</a></li>
<li><a href="{{ page.relative_path }}icon/star-empty"><i class="icon-star-empty"></i> icon-star-empty</a></li>
<li><a href="{{ page.relative_path }}icon/star-half-full"><i class="icon-star-half-full"></i> icon-star-half-full <span class="muted">(alias)</span></a></li>
<li><a href="{{ page.relative_path }}icon/star-half-empty"><i class="icon-star-half-empty"></i> icon-star-half-empty</a></li>
<li><a href="{{ page.relative_path }}icon/star-half"><i class="icon-star-half"></i> icon-star-half</a></li>
<li><a href="{{ page.relative_path }}icon/star"><i class="icon-star"></i> icon-star</a></li>

View file

@ -11,21 +11,8 @@
<a href="https://twitter.com/{{ site.font_awesome.twitter }}" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @{{ site.font_awesome.twitter }}</a>
</li>
<li class="tweet-btn">
<a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.font_awesome.url }}" data-text="#FontAwesome, the iconic font designed for Bootstrap" data-counturl="{{ site.font_awesome.legacy_url }}" data-count="horizontal" data-via="{{ site.font_awesome.twitter }}" data-related="{{ site.font_awesome.author.twitter }}:Creator of Font Awesome">Tweet</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.font_awesome.url }}" data-text="Font Awesome, the iconic font designed for Bootstrap" data-counturl="{{ site.font_awesome.legacy_url }}" data-count="horizontal" data-via="{{ site.font_awesome.twitter }}" data-related="{{ site.font_awesome.author.twitter }}:Creator of Font Awesome">Tweet</a>
</li>
</ul>
<!--<div class="watch">-->
<!--<a class="btn btn-mini" href="https://github.com/FortAwesome/Font-Awesome" target="_blank"><i class="icon-github icon-large"></i> Watch</a>-->
<!--<a id="watchers" class="count btn btn-mini" href="https://github.com/FortAwesome/Font-Awesome">9000+</a>-->
<!--</div>-->
<!--<div class="fork">-->
<!--<a class="btn btn-mini" href="https://github.com/FortAwesome/Font-Awesome" target="_blank"><i class="icon-github icon-large"></i> Fork</a>-->
<!--<a id="forks" class="count btn btn-mini" href="#">800+</a>-->
<!--</div>-->
<!--<div class="follow">-->
<!--<a class="btn btn-mini" href="http://twitter.com/fortaweso_me/" target="_blank"><i class="icon-twitter icon-large"></i> Follow @fortaweso_me</a>-->
<!--<span id="followers" class="count btn btn-mini">2500+</span>-->
<!--</div>-->
</div>
</div>

View file

@ -11,7 +11,7 @@
<title>{% if page.title %}{{ page.title }}{% endif %}</title>
<meta name="description" content="Font Awesome, the iconic font designed for use with Bootstrap">
<meta name="author" content="Dave Gandy">
<meta name="viewport" content="initial-scale=1; maximum-scale=1">
<!--<meta name="viewport" content="initial-scale=1; maximum-scale=1">-->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -367,6 +367,7 @@ a [class*=" icon-"] {
.icon-code { .ie7icon('&#xf121;'); }
.icon-reply-all { .ie7icon('&#xf122;'); }
.icon-mail-reply-all { .ie7icon('&#xf122;'); }
.icon-star-half-full,
.icon-star-half-empty { .ie7icon('&#xf123;'); }
.icon-location-arrow { .ie7icon('&#xf124;'); }
.icon-crop { .ie7icon('&#xf125;'); }

View file

@ -284,6 +284,7 @@
.icon-code:before { content: "\f121"; }
.icon-reply-all:before, { content: "\f122"; }
.icon-mail-reply-all:before { content: "\f122"; }
.icon-star-half-full:before,
.icon-star-half-empty:before { content: "\f123"; }
.icon-location-arrow:before { content: "\f124"; }
.icon-crop:before { content: "\f125"; }

View file

@ -12,8 +12,8 @@
}
.navbar .nav > li > a { padding: 12px 10px 9px; }
.navbar .nav.pull-right { margin-right: -10px; }
.navbar, .jumbotron, #social-buttons { min-width: 990px; } // necessary fix for non-responsive layouts
h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }

1
build/design.html Normal file
View file

@ -0,0 +1 @@
<META HTTP-EQUIV=REFRESH CONTENT="0; URL=cheatsheet/">

View file

@ -1860,6 +1860,8 @@ icons:
id: star-half-empty
unicode: f123
created: 3.1.0
aliases:
- star-half-full
categories:
- Web Application Icons

32
package.json Normal file
View file

@ -0,0 +1,32 @@
{
"name": "font-awesome",
"description": "the iconic font designed for Bootstrap",
"version": "3.1.1",
"author": {
"name": "Dave Gandy",
"email": "dave@fontawesome.io"
},
"contributors": [
"sergio <desenvolvimento@inbep.com.br>",
"willian <desenvolvimento@inbep.com.br>"
],
"homepage": "http://fontawesome.io",
"repository": {
"type": "git",
"url": "https://github.com/FortAwesome/Font-Awesome.git"
},
"licenses": [
{
"type": "SIL OFL 1.1",
"url": "http://scripts.sil.org/OFL"
},
{
"type": "MIT License",
"url": "http://opensource.org/licenses/mit-license.html"
},
{
"type": "CC BY 3.0",
"url": "http://creativecommons.org/licenses/by/3.0/"
}
]
}