Skip to content

Commit

Permalink
actually added font awesome due to submodule fail
Browse files Browse the repository at this point in the history
  • Loading branch information
naggie committed Apr 14, 2013
1 parent 81734f9 commit 3ea05c8
Show file tree
Hide file tree
Showing 104 changed files with 16,470 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "megafilter",
"homepage": "http://callanbryant.co.uk/megafilter/",
"keywords": ["google reader","rss","aggregator"],
"version": "0.1.4",
"version": "0.1.5",
"author" : "Callan Bryant <[email protected]> (http://callanbryant.co.uk/)",
"scripts": {
"start": "node app"
Expand Down
1 change: 0 additions & 1 deletion public/font-awesome
Submodule font-awesome deleted from 13d5dd
29 changes: 29 additions & 0 deletions public/font-awesome/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
*.pyc
*.egg-info
*.db
*.db.old
*.swp
*.db-journal

.coverage
.DS_Store
.installed.cfg

.idea/*
.svn/*
src/website/static/*
src/website/media/*

bin
build
cfcache
develop-eggs
dist
downloads
eggs
parts
tmp
.sass-cache

src/website/settingslocal.py
stunnel.log
22 changes: 22 additions & 0 deletions public/font-awesome/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#Font Awesome 3.0.2
##the iconic font designed for use with Twitter Bootstrap

The full suite of pictographic icons, examples, and documentation can be found at:
http://fortawesome.github.com/Font-Awesome/


##License
- The Font Awesome font is licensed under the SIL Open Font License - 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 pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
- Attribution is no longer required in Font Awesome 3.0, but much appreciated: "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"

##Contact
- Email: [email protected]
- Twitter: http://twitter.com/fortaweso_me
- Work: Lead Product Designer @ http://kyru.us

##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
22 changes: 22 additions & 0 deletions public/font-awesome/css/font-awesome-ie7.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit 3ea05c8

Please sign in to comment.