Skip to content

Commit c93c1f8

Browse files
authored
Merge pull request #28 from bittner/feature/add-latest-jquery-to-bootstrap
Add jQuery v3.1.1 (latest, compatible with Bootstrap)
2 parents a059032 + f8ddc65 commit c93c1f8

File tree

5 files changed

+10255
-5
lines changed

5 files changed

+10255
-5
lines changed

README.rst

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
Django Bootstrap Static Files |bootstrap| |fontawesome|
2-
=======================================================
1+
Django Bootstrap Static Files
2+
=============================
3+
4+
|bootstrap| |jquery| |fontawesome|
35

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

8+
Also ships the latest jQuery compatible with Bootstrap, for optional inclusion.
9+
610
.. |bootstrap| image:: https://img.shields.io/badge/Bootstrap-v3.3.7-563d7c.svg
7-
:alt: Bootstrap
11+
:alt: Bootstrap 3.3.7
12+
:target: http://getbootstrap.com/getting-started/
13+
.. |jquery| image:: https://img.shields.io/badge/jQuery-v3.1.1-0769ad.svg
14+
:alt: jQuery 3.1.1
815
:target: http://getbootstrap.com/getting-started/
916
.. |fontawesome| image:: https://img.shields.io/badge/FontAwesome-v4.7.0-1c9a71.svg
10-
:alt: Font Awesome
17+
:alt: Font Awesome 4.7.0
1118
:target: http://fontawesome.io/get-started/
1219

1320
Install
@@ -43,6 +50,7 @@ Then you can include CSS and JavaScript as usual static resources, e.g. using
4350
</head>
4451
<body>
4552
...
53+
<script src="{% static 'bootstrap/js/jquery.min.js' %}"></script>
4654
<script src="{% static 'bootstrap/js/bootstrap.min.js' %}"></script>
4755
</body>
4856
@@ -57,6 +65,23 @@ Contribution
5765
Occasionally, I forget to update this package with new bootstrap updates.
5866
Please feel free to submit a PR.
5967

68+
Sources and Procedures
69+
^^^^^^^^^^^^^^^^^^^^^^
70+
71+
Bootstrap: (all files from dist package)
72+
`Bootstrap website / Getting started`_ -> drop into ``bootstrap/static/bootstrap/``
73+
jQuery: (compressed, uncompressed, map)
74+
`jQuery website / Download`_ -> rename and mix into ``bootstrap/static/bootstrap/js/``
75+
76+
Pick the latest version denoted as a dependency in ``bower.json`` (see `Plugin dependencies`_).
77+
Font Awesome: (``css/``, ``fonts/`` only)
78+
`Font Awesome website`_ ("No thanks, just download") -> drop into ``fontawesome/static/fontawesome/``
79+
80+
.. _Bootstrap website / Getting started: http://getbootstrap.com/getting-started/
81+
.. _jQuery website / Download: http://jquery.com/download/
82+
.. _Plugin dependencies: https://getbootstrap.com/javascript/
83+
.. _Font Awesome website: http://fontawesome.io/
84+
6085
Releases
6186
--------
6287

0 commit comments

Comments
 (0)