Skip to content

Commit

Permalink
Merge pull request #25 from dstegelman/3.3.6
Browse files Browse the repository at this point in the history
Bootstrap 3.3.6 fontawesome 4.5.0
  • Loading branch information
dstegelman committed Dec 10, 2015
2 parents 98da90a + 5cb5448 commit 139fc92
Show file tree
Hide file tree
Showing 47 changed files with 480 additions and 2,965 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
Django Bootstrap Static Files
=============================

Currently: Bootstrap 3.3.6 and Font Awesome 4.5.0

Bootstrap and optional Font Awesome static files ready for the picking.

Install
-------

pip install django-bootstrap-static==3.3.5
pip install django-bootstrap-static==3.3.6

Contribution
------------
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/static/bootstrap/css/bootstrap-theme.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bootstrap/static/bootstrap/css/bootstrap-theme.css.map

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions bootstrap/static/bootstrap/css/bootstrap-theme.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions bootstrap/static/bootstrap/css/bootstrap-theme.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 30 additions & 70 deletions bootstrap/static/bootstrap/css/bootstrap.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bootstrap/static/bootstrap/css/bootstrap.css.map

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions bootstrap/static/bootstrap/css/bootstrap.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions bootstrap/static/bootstrap/css/bootstrap.min.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit 139fc92

Please sign in to comment.