mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-02-23 06:50:40 +03:00
Merge pull request #595 from kappataumu/issue-589
Update Bootstrap CSS and JS to v4.0.0-alpha.2 minified. Fixes #589
This commit is contained in:
commit
e2e0748e36
|
@ -2,6 +2,10 @@
|
|||
All enhancements and patches to Cookiecutter Django will be documented in this file.
|
||||
This project adheres to [Semantic Versioning](http://semver.org/).
|
||||
|
||||
##[2016-06-06]
|
||||
### Changed
|
||||
- Pin Bootstrap CSS and JS to v4.0.0-alpha.2, use minified versions
|
||||
|
||||
##[2016-06-05]
|
||||
### Added
|
||||
- Configurable admin for users (@pydanny, @jayfk, @dezoito)
|
||||
|
|
|
@ -83,6 +83,7 @@ Listed in alphabetical order.
|
|||
Jens Nilsson `@phiberjenz`
|
||||
Julio Castillo `@juliocc`_
|
||||
Kaido Kert `@kaidokert`_
|
||||
kappataumu `@kappataumu`_ @kappataumu
|
||||
Kaveh `@ka7eh`_
|
||||
Kevin A. Stone
|
||||
Kevin Ndung'u `@kevgathuku`_
|
||||
|
@ -162,6 +163,7 @@ Listed in alphabetical order.
|
|||
.. _@jvanbrug: https://github.com/jvanbrug
|
||||
.. _@ka7eh: https://github.com/ka7eh
|
||||
.. _@kaidokert: https://github.com/kaidokert
|
||||
.. _@kappataumu: https://github.com/kappataumu
|
||||
.. _@kevgathuku: https://github.com/kevgathuku
|
||||
.. _@knitatoms: https://github.com/knitatoms
|
||||
.. _@MathijsHoogland: https://github.com/MathijsHoogland
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
{% block css %}
|
||||
<!-- Latest compiled and minified CSS -->
|
||||
<link rel="stylesheet" href="https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/css/bootstrap.css">
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" integrity="sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd" crossorigin="anonymous">
|
||||
|
||||
<!-- Your stuff: Third-party css libraries go here -->
|
||||
|
||||
|
@ -95,7 +95,7 @@
|
|||
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js"></script>
|
||||
|
||||
<!-- Latest compiled and minified JavaScript -->
|
||||
<script src="https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/js/bootstrap.js"></script>
|
||||
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js" integrity="sha384-vZ2WRJMwsjRMW/8U7i6PWi6AlO1L79snBrmgiDpgIWJ82z8eA5lenwvxbMV1PAh7" crossorigin="anonymous"></script>
|
||||
|
||||
<!-- Your stuff: Third-party javascript libraries go here -->
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user