-
Notifications
You must be signed in to change notification settings - Fork 488
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Must've accidentally undone the fontawesome 4 upgrade. This fixes it.
- Loading branch information
Jonathan Kim
committed
Nov 1, 2013
1 parent
89e367f
commit 0d1a794
Showing
692 changed files
with
106,034 additions
and
6,411 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
{ | ||
"name": "font-awesome", | ||
"homepage": "https://github.com/FortAwesome/Font-Awesome", | ||
"version": "3.2.1", | ||
"_release": "3.2.1", | ||
"version": "4.0.1", | ||
"_release": "4.0.1", | ||
"_resolution": { | ||
"type": "version", | ||
"tag": "v3.2.1", | ||
"commit": "8d6f493a347c6408f47b8526bf815fecdb0d827a" | ||
"tag": "v4.0.1", | ||
"commit": "431f3223f9ec7d0068d294adf2963234ab1ba7e2" | ||
}, | ||
"_source": "git://github.com/FortAwesome/Font-Awesome.git", | ||
"_target": "~3.2.1", | ||
"_target": "~4.0.0", | ||
"_originalSource": "font-awesome" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,3 +28,5 @@ node_modules | |
|
||
src/website/settingslocal.py | ||
stunnel.log | ||
|
||
.ruby-version |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,4 +43,4 @@ PLATFORMS | |
|
||
DEPENDENCIES | ||
debugger | ||
jekyll (= 1.0) | ||
jekyll (~> 1.0) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
#[Font Awesome v3.2.1](http://fontawesome.io) | ||
#[Font Awesome v4.0.1](http://fontawesome.io) | ||
###the iconic font designed for Bootstrap | ||
|
||
Font Awesome is a full suite of 361 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). | ||
Font Awesome is a full suite of 370 pictographic icons for easy scalable vector graphics on websites, created and | ||
maintained by [Dave Gandy](http://twitter.com/davegandy). Stay up to date [@fontawesome](http://twitter.com/fontawesome). | ||
|
||
Get started at http://fontawesome.io! | ||
|
||
|
@@ -25,6 +25,8 @@ Get started at http://fontawesome.io! | |
- [v3.1.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=4&page=1&state=closed) | ||
- [v3.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=3&page=1&state=closed) | ||
- [v3.2.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=5&page=1&state=closed) | ||
- [v4.0.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=2&page=1&state=closed) | ||
- [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed) | ||
|
||
##Versioning | ||
|
||
|
@@ -42,10 +44,21 @@ For more information on SemVer, please visit http://semver.org. | |
|
||
##Author | ||
- Email: [email protected] | ||
- Twitter: http://twitter.com/byscuits | ||
- Twitter: http://twitter.com/davegandy | ||
- GitHub: https://github.com/davegandy | ||
- Work: Lead Product Designer @ http://kyru.us | ||
|
||
##Component | ||
To include as a [component](http://github.com/component/component), just run | ||
|
||
$ component install FortAwesome/Font-Awesome | ||
|
||
Or add | ||
|
||
"FortAwesome/Font-Awesome": "*" | ||
|
||
to the `dependencies` in your `component.json`. | ||
|
||
## Hacking on Font Awesome | ||
|
||
From the root of the repository, install the tools used to develop. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,25 +11,26 @@ pygments: true | |
permalink: pretty | ||
|
||
# ensures SCSS files are compiled | ||
include: [_bootstrap.scss, _core.scss, _extras.scss, _icons.scss, _mixins.scss, _path.scss, _variables.scss] | ||
include: [_bordered-pulled.scss, _core.scss, _fixed-width.scss, _icons.scss, _larger.scss, _list.scss, _mixins.scss, _path.scss, _rotated-flipped.scss, _spinning.scss, _stacked.scss, _variables.scss] | ||
|
||
# used in building icon pages | ||
icon_meta: src/icons.yml | ||
icon_layout: icon.html # Relative to _layouts directory | ||
icon_destination: icon # Relative to destination | ||
|
||
fontawesome: | ||
version: 3.2.1 | ||
minor_version: 3.2 | ||
version: 4.0.1 | ||
minor_version: 4.0 | ||
url: http://fontawesome.io | ||
legacy_url: http://fortawesome.github.com/Font-Awesome/ | ||
blog_url: http://blog.fontawesome.io | ||
twitter: fontawesome | ||
tagline: The iconic font designed for Bootstrap | ||
css_prefix: fa | ||
author: | ||
name: Dave Gandy | ||
email: [email protected] | ||
twitter: byscuits | ||
twitter: davegandy | ||
work: | ||
name: Kyruus | ||
url: http://kyruus.com | ||
|
@@ -50,5 +51,8 @@ fontawesome: | |
url: http://creativecommons.org/licenses/by/3.0/ | ||
|
||
bootstrap: | ||
version: 2.3.2 | ||
version: 3.0.0 | ||
url: http://getbootstrap.com | ||
|
||
jquery: | ||
version: 1.10.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
{ | ||
"name": "Font-Awesome", | ||
"repo": "FortAwesome/Font-Awesome", | ||
"description": "Font Awesome", | ||
"version": "4.0.1", | ||
"keywords": [], | ||
"dependencies": {}, | ||
"development": {}, | ||
"license": "SIL, MIT, CC BY 3.0", | ||
"styles": [ | ||
"css/font-awesome.css" | ||
], | ||
"fonts": [ | ||
"fonts/fontawesome-webfont.eot", | ||
"fonts/fontawesome-webfont.svg", | ||
"fonts/fontawesome-webfont.ttf", | ||
"fonts/fontawesome-webfont.woff", | ||
"fonts/FontAwesome.otf" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,12 +8,12 @@ | |
"name": "Dave Gandy", | ||
"email": "[email protected]", | ||
"role": "Developer", | ||
"homepage": "http://twitter.com/byscuits" | ||
"homepage": "http://twitter.com/davegandy" | ||
} | ||
], | ||
"extra": { | ||
"branch-alias": { | ||
"dev-master": "3.2.x-dev" | ||
"dev-master": "4.0.x-dev" | ||
} | ||
}, | ||
"license": [ | ||
|
@@ -22,6 +22,6 @@ | |
], | ||
"require-dev": { | ||
"jekyll": "1.0.2", | ||
"lessc": "1.3.3" | ||
"lessc": "1.4.2" | ||
} | ||
} |
Oops, something went wrong.