Merge pull request #26 from bittner/feature/update-bootstrap-v3.3.7-f…

…ont-awesome-v4.7.0 Update: Bootstrap v3.3.7, Font Awesome v4.7.0
bittner · Feb 7, 2017 · a059032 · a059032
2 parents 139fc92 + 4949b9d
commit a059032
Show file tree

Hide file tree

Showing 22 changed files with 3,088 additions and 774 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
-include README.md
+include README.rst
 recursive-include bootstrap/static *.*
 recursive-include fontawesome/static *.*
diff --git a/README.md b/README.md
diff --git a/README.rst b/README.rst
@@ -0,0 +1,71 @@
+Django Bootstrap Static Files |bootstrap| |fontawesome|
+=======================================================
+
+Bootstrap and optional Font Awesome static files ready for the picking.
+
+.. |bootstrap| image:: https://img.shields.io/badge/Bootstrap-v3.3.7-563d7c.svg
+   :alt: Bootstrap
+   :target: http://getbootstrap.com/getting-started/
+.. |fontawesome| image:: https://img.shields.io/badge/FontAwesome-v4.7.0-1c9a71.svg
+   :alt: Font Awesome
+   :target: http://fontawesome.io/get-started/
+
+Install
+-------
+
+.. code-block:: bash
+
+    pip install django-bootstrap-static
+
+Configuration
+-------------
+
+To pickup Bootstrap static files, simply include ``'bootstrap'``, and optionally
+``'fontawesome'``, in your ``INSTALLED_APPS``:
+
+.. code-block:: python
+
+    INSTALLED_APPS = [
+        # ...
+        'bootstrap',
+        'fontawesome',
+    ]
+
+Then you can include CSS and JavaScript as usual static resources, e.g. using
+``{% static '...' %}`` in your base template as follows:
+
+.. code-block:: django
+
+    {% load static %}
+    <head>
+        <link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}">
+        <link rel="stylesheet" href="{% static 'fontawesome/css/font-awesome.min.css' %}">
+    </head>
+    <body>
+        ...
+        <script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
+    </body>
+
+More details on integration may be available from each of the two projects:
+
+- http://getbootstrap.com/getting-started/
+- http://fontawesome.io/get-started/
+
+Contribution
+------------
+
+Occasionally, I forget to update this package with new bootstrap updates.
+Please feel free to submit a PR.
+
+Releases
+--------
+
+To keep with the Bootstrap release schedule we will keep version numbers of
+this app in sync with the bootstrap Major.Minor.Revision changes (`semver`_).
+The additional version number will be added at the end to denote a new change
+within this package itself.
+
+``django-bootstrap-static==3.3.1.1`` == Bootstrap ``3.3.1`` with an additional
+package change.
+
+.. _semver: http://semver.org/
diff --git a/bootstrap/static/bootstrap/css/bootstrap-theme.css b/bootstrap/static/bootstrap/css/bootstrap-theme.css
diff --git a/bootstrap/static/bootstrap/css/bootstrap-theme.css.map b/bootstrap/static/bootstrap/css/bootstrap-theme.css.map
diff --git a/bootstrap/static/bootstrap/css/bootstrap-theme.min.css b/bootstrap/static/bootstrap/css/bootstrap-theme.min.css
diff --git a/bootstrap/static/bootstrap/css/bootstrap-theme.min.css.map b/bootstrap/static/bootstrap/css/bootstrap-theme.min.css.map
diff --git a/bootstrap/static/bootstrap/css/bootstrap.css b/bootstrap/static/bootstrap/css/bootstrap.css
diff --git a/bootstrap/static/bootstrap/css/bootstrap.css.map b/bootstrap/static/bootstrap/css/bootstrap.css.map
diff --git a/bootstrap/static/bootstrap/css/bootstrap.min.css b/bootstrap/static/bootstrap/css/bootstrap.min.css
diff --git a/bootstrap/static/bootstrap/css/bootstrap.min.css.map b/bootstrap/static/bootstrap/css/bootstrap.min.css.map