Skip to content

Commit a059032

Browse files
dstegelmandstegelman
authored
Merge pull request #26 from bittner/feature/update-bootstrap-v3.3.7-font-awesome-v4.7.0
Update: Bootstrap v3.3.7, Font Awesome v4.7.0
2 parents 139fc92 + 4949b9d commit a059032

22 files changed

+3088
-774
lines changed

‎MANIFEST.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
include README.md
1+
include README.rst
22
recursive-include bootstrap/static *.*
33
recursive-include fontawesome/static *.*

‎README.md‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎README.rst‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
Django Bootstrap Static Files |bootstrap| |fontawesome|
2+
=======================================================
3+
4+
Bootstrap and optional Font Awesome static files ready for the picking.
5+
6+
.. |bootstrap| image:: https://img.shields.io/badge/Bootstrap-v3.3.7-563d7c.svg
7+
:alt: Bootstrap
8+
:target: http://getbootstrap.com/getting-started/
9+
.. |fontawesome| image:: https://img.shields.io/badge/FontAwesome-v4.7.0-1c9a71.svg
10+
:alt: Font Awesome
11+
:target: http://fontawesome.io/get-started/
12+
13+
Install
14+
-------
15+
16+
.. code-block:: bash
17+
18+
pip install django-bootstrap-static
19+
20+
Configuration
21+
-------------
22+
23+
To pickup Bootstrap static files, simply include ``'bootstrap'``, and optionally
24+
``'fontawesome'``, in your ``INSTALLED_APPS``:
25+
26+
.. code-block:: python
27+
28+
INSTALLED_APPS = [
29+
# ...
30+
'bootstrap',
31+
'fontawesome',
32+
]
33+
34+
Then you can include CSS and JavaScript as usual static resources, e.g. using
35+
``{% static '...' %}`` in your base template as follows:
36+
37+
.. code-block:: django
38+
39+
{% load static %}
40+
<head>
41+
<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}">
42+
<link rel="stylesheet" href="{% static 'fontawesome/css/font-awesome.min.css' %}">
43+
</head>
44+
<body>
45+
...
46+
<script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
47+
</body>
48+
49+
More details on integration may be available from each of the two projects:
50+
51+
- http://getbootstrap.com/getting-started/
52+
- http://fontawesome.io/get-started/
53+
54+
Contribution
55+
------------
56+
57+
Occasionally, I forget to update this package with new bootstrap updates.
58+
Please feel free to submit a PR.
59+
60+
Releases
61+
--------
62+
63+
To keep with the Bootstrap release schedule we will keep version numbers of
64+
this app in sync with the bootstrap Major.Minor.Revision changes (`semver`_).
65+
The additional version number will be added at the end to denote a new change
66+
within this package itself.
67+
68+
``django-bootstrap-static==3.3.1.1`` == Bootstrap ``3.3.1`` with an additional
69+
package change.
70+
71+
.. _semver: http://semver.org/

‎bootstrap/static/bootstrap/css/bootstrap-theme.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/static/bootstrap/css/bootstrap-theme.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/static/bootstrap/css/bootstrap-theme.min.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/static/bootstrap/css/bootstrap-theme.min.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/static/bootstrap/css/bootstrap.css‎

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/static/bootstrap/css/bootstrap.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/static/bootstrap/css/bootstrap.min.css‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)