Skip to content

Commit 0d1a794

Browse files
author
Jonathan Kim
committed
Must've accidentally undone the fontawesome 4 upgrade. This fixes it.
1 parent 89e367f commit 0d1a794

File tree

692 files changed

+106034
-6411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

692 files changed

+106034
-6411
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"backbone": "~1.1.0",
2525
"backbone-deep-model": "~0.10.4",
2626
"rivets": "~0.5.13",
27-
"font-awesome": "~3.2.1"
27+
"font-awesome": "~4.0.0"
2828
}
2929
}
+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "font-awesome",
33
"homepage": "https://github.com/FortAwesome/Font-Awesome",
4-
"version": "3.2.1",
5-
"_release": "3.2.1",
4+
"version": "4.0.1",
5+
"_release": "4.0.1",
66
"_resolution": {
77
"type": "version",
8-
"tag": "v3.2.1",
9-
"commit": "8d6f493a347c6408f47b8526bf815fecdb0d827a"
8+
"tag": "v4.0.1",
9+
"commit": "431f3223f9ec7d0068d294adf2963234ab1ba7e2"
1010
},
1111
"_source": "git://github.com/FortAwesome/Font-Awesome.git",
12-
"_target": "~3.2.1",
12+
"_target": "~4.0.0",
1313
"_originalSource": "font-awesome"
1414
}

bower_components/font-awesome/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ node_modules
2828

2929
src/website/settingslocal.py
3030
stunnel.log
31+
32+
.ruby-version

bower_components/font-awesome/.ruby-version

-1
This file was deleted.

bower_components/font-awesome/Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ PLATFORMS
4343

4444
DEPENDENCIES
4545
debugger
46-
jekyll (= 1.0)
46+
jekyll (~> 1.0)

bower_components/font-awesome/README.md

+17-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
#[Font Awesome v3.2.1](http://fontawesome.io)
1+
#[Font Awesome v4.0.1](http://fontawesome.io)
22
###the iconic font designed for Bootstrap
33

4-
Font Awesome is a full suite of 361 pictographic icons for easy scalable vector graphics on websites, created and
5-
maintained by [Dave Gandy](http://twitter.com/byscuits). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
4+
Font Awesome is a full suite of 370 pictographic icons for easy scalable vector graphics on websites, created and
5+
maintained by [Dave Gandy](http://twitter.com/davegandy). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
66

77
Get started at http://fontawesome.io!
88

@@ -25,6 +25,8 @@ Get started at http://fontawesome.io!
2525
- [v3.1.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=4&page=1&state=closed)
2626
- [v3.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=3&page=1&state=closed)
2727
- [v3.2.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=5&page=1&state=closed)
28+
- [v4.0.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=2&page=1&state=closed)
29+
- [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed)
2830

2931
##Versioning
3032

@@ -42,10 +44,21 @@ For more information on SemVer, please visit http://semver.org.
4244

4345
##Author
4446
45-
- Twitter: http://twitter.com/byscuits
47+
- Twitter: http://twitter.com/davegandy
4648
- GitHub: https://github.com/davegandy
4749
- Work: Lead Product Designer @ http://kyru.us
4850

51+
##Component
52+
To include as a [component](http://github.com/component/component), just run
53+
54+
$ component install FortAwesome/Font-Awesome
55+
56+
Or add
57+
58+
"FortAwesome/Font-Awesome": "*"
59+
60+
to the `dependencies` in your `component.json`.
61+
4962
## Hacking on Font Awesome
5063

5164
From the root of the repository, install the tools used to develop.

bower_components/font-awesome/_config.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,26 @@ pygments: true
1111
permalink: pretty
1212

1313
# ensures SCSS files are compiled
14-
include: [_bootstrap.scss, _core.scss, _extras.scss, _icons.scss, _mixins.scss, _path.scss, _variables.scss]
14+
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]
1515

1616
# used in building icon pages
1717
icon_meta: src/icons.yml
1818
icon_layout: icon.html # Relative to _layouts directory
1919
icon_destination: icon # Relative to destination
2020

2121
fontawesome:
22-
version: 3.2.1
23-
minor_version: 3.2
22+
version: 4.0.1
23+
minor_version: 4.0
2424
url: http://fontawesome.io
2525
legacy_url: http://fortawesome.github.com/Font-Awesome/
2626
blog_url: http://blog.fontawesome.io
2727
twitter: fontawesome
2828
tagline: The iconic font designed for Bootstrap
29+
css_prefix: fa
2930
author:
3031
name: Dave Gandy
3132
32-
twitter: byscuits
33+
twitter: davegandy
3334
work:
3435
name: Kyruus
3536
url: http://kyruus.com
@@ -50,5 +51,8 @@ fontawesome:
5051
url: http://creativecommons.org/licenses/by/3.0/
5152

5253
bootstrap:
53-
version: 2.3.2
54+
version: 3.0.0
5455
url: http://getbootstrap.com
56+
57+
jquery:
58+
version: 1.10.2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "Font-Awesome",
3+
"repo": "FortAwesome/Font-Awesome",
4+
"description": "Font Awesome",
5+
"version": "4.0.1",
6+
"keywords": [],
7+
"dependencies": {},
8+
"development": {},
9+
"license": "SIL, MIT, CC BY 3.0",
10+
"styles": [
11+
"css/font-awesome.css"
12+
],
13+
"fonts": [
14+
"fonts/fontawesome-webfont.eot",
15+
"fonts/fontawesome-webfont.svg",
16+
"fonts/fontawesome-webfont.ttf",
17+
"fonts/fontawesome-webfont.woff",
18+
"fonts/FontAwesome.otf"
19+
]
20+
}

bower_components/font-awesome/composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"name": "Dave Gandy",
99
"email": "[email protected]",
1010
"role": "Developer",
11-
"homepage": "http://twitter.com/byscuits"
11+
"homepage": "http://twitter.com/davegandy"
1212
}
1313
],
1414
"extra": {
1515
"branch-alias": {
16-
"dev-master": "3.2.x-dev"
16+
"dev-master": "4.0.x-dev"
1717
}
1818
},
1919
"license": [
@@ -22,6 +22,6 @@
2222
],
2323
"require-dev": {
2424
"jekyll": "1.0.2",
25-
"lessc": "1.3.3"
25+
"lessc": "1.4.2"
2626
}
2727
}

0 commit comments

Comments
 (0)