Skip to content
Browse files

Update licenses and README for Bootstrap and Font Awesome

  • Loading branch information...
1 parent 0be674e commit 450e1a3a08a175425014475b0266e619c3a04124 @gauden gauden committed Jan 9, 2013
Showing with 14 additions and 1 deletion.
  1. +8 −1 README.md
  2. +6 −0 licenses/Font-Awesome-license.txt
View
9 README.md
@@ -118,7 +118,10 @@ The application code is located at `src/application`.
|-- static
| |-- css
| | |-- bootstrap-*.css (Twitter Bootstrap styles)
+ | | |-- fontawesome-*.css (Fontawesome styles)
| | `-- main.css (custom styles)
+ | |-- font
+ | | `various fontawesome font files
| |-- img
| | |-- favicon.ico
| | |-- favicon.png
@@ -164,9 +167,10 @@ See licenses/ folder
Package Versions
----------------
- Blinker: 1.1
-- Bootstrap: 2.2.1
+- Bootstrap: 2.2.2
- Flask: 0.9
- Flask-WTF: 0.6
+- FontAwesome: 3.0
- Jinja2: 2.6 (included in GAE)
- Modernizr: 2.6.2
- Werkzeug: 0.8.3
@@ -180,13 +184,16 @@ Project template layout was heavily inspired by Francisco Souza's
Layout, form, table, and button styles provided by [Bootstrap][bootstrap]
+[Font Awesome][fontawesome] by Dave Gandy
+
HTML5 detection provided by [Modernizr 2][modernizr] (configured with all features)
[appcfg]: http://code.google.com/appengine/docs/python/tools/uploadinganapp.html
[bootstrap]: http://twitter.github.com/bootstrap
[devserver]: http://code.google.com/appengine/docs/python/tools/devserver.html
[flask]: http://flask.pocoo.org
+[fontawesome]: http://fortawesome.github.com/Font-Awesome/
[html5]: http://html5boilerplate.com/
[jinja2]: http://jinja.pocoo.org/2/documentation/
[gaeseries]: http://github.com/franciscosouza/gaeseries/tree/flask
View
6 licenses/Font-Awesome-license.txt
@@ -0,0 +1,6 @@
+- 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.

0 comments on commit 450e1a3

Please sign in to comment.
Something went wrong with that request. Please try again.