forked from naggie/megafilter
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
actually added font awesome due to submodule fail
- Loading branch information
Showing
104 changed files
with
16,470 additions
and
2 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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" | ||
|
Submodule font-awesome
deleted from
13d5dd
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,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 |
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,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 |
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.