Skip to content

Commit 7d0d22f

Browse files
carltongibsontomchristie
authored andcommitted
Use single copy of static assets. Update jQuery (#5823)
* Move font-awesome to top level. * Use top-level jQuery & Bootstrap * Update to jQuery v3.3.1 Compatible with Bootstrap v3.3.7 c.f. twbs/bootstrap#16834 (comment) * Re-add bootstrap-theme
1 parent d1c92c8 commit 7d0d22f

20 files changed

+10
-320
lines changed

rest_framework/static/rest_framework/docs/css/bootstrap.min.css

Lines changed: 0 additions & 6 deletions
This file was deleted.
Binary file not shown.

rest_framework/static/rest_framework/docs/fonts/glyphicons-halflings-regular.svg

Lines changed: 0 additions & 288 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.

rest_framework/static/rest_framework/docs/js/bootstrap.min.js

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

rest_framework/static/rest_framework/docs/js/jquery-1.10.2.min.js

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

rest_framework/static/rest_framework/js/jquery-1.12.4.min.js

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

rest_framework/static/rest_framework/js/jquery-3.3.1.min.js

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

rest_framework/templates/rest_framework/admin.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ <h4 class="modal-title" id="myModalLabel">{{ error_title }}</h4>
236236
csrfCookieName: "{{ csrf_cookie_name|default:'csrftoken' }}"
237237
};
238238
</script>
239-
<script src="{% static "rest_framework/js/jquery-1.12.4.min.js" %}"></script>
239+
<script src="{% static "rest_framework/js/jquery-3.3.1.min.js" %}"></script>
240240
<script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
241241
<script src="{% static "rest_framework/js/csrf.js" %}"></script>
242242
<script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>

rest_framework/templates/rest_framework/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ <h1>{{ name }}</h1>
275275
csrfCookieName: "{{ csrf_cookie_name|default:'csrftoken' }}"
276276
};
277277
</script>
278-
<script src="{% static "rest_framework/js/jquery-1.12.4.min.js" %}"></script>
278+
<script src="{% static "rest_framework/js/jquery-3.3.1.min.js" %}"></script>
279279
<script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
280280
<script src="{% static "rest_framework/js/csrf.js" %}"></script>
281281
<script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>

rest_framework/templates/rest_framework/docs/error.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ <h2>Overriding this template</h2>
6666

6767

6868

69-
<script src="{% static 'rest_framework/docs/js/jquery-1.10.2.min.js' %}"></script>
69+
<script src="{% static 'rest_framework/js/jquery-3.3.1.min.js' %}"></script>
7070
</body>
7171
</html>

rest_framework/templates/rest_framework/docs/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<title>{{ document.title }}</title>
1010

11-
<link href="{% static 'rest_framework/docs/css/bootstrap.min.css' %}" rel="stylesheet">
12-
<link href="{% static 'rest_framework/docs/css/bootstrap-theme.min.css' %}" rel="stylesheet">
13-
<link href="{% static 'rest_framework/docs/css/font-awesome-4.0.3.css' %}" rel="stylesheet">
11+
<link href="{% static 'rest_framework/css/bootstrap.min.css' %}" rel="stylesheet">
12+
<link href="{% static 'rest_framework/css/bootstrap-theme.min.css' %}" rel="stylesheet">
13+
<link href="{% static 'rest_framework/css/font-awesome-4.0.3.css' %}" rel="stylesheet">
1414
<link href="{% static 'rest_framework/docs/css/base.css' %}" rel="stylesheet">
1515
<link href="{% static 'rest_framework/docs/css/jquery.json-view.min.css' %}" rel="stylesheet">
1616

@@ -38,8 +38,8 @@
3838
{% include "rest_framework/docs/auth/basic.html" %}
3939
{% include "rest_framework/docs/auth/session.html" %}
4040

41-
<script src="{% static 'rest_framework/docs/js/jquery-1.10.2.min.js' %}"></script>
42-
<script src="{% static 'rest_framework/docs/js/bootstrap.min.js' %}"></script>
41+
<script src="{% static 'rest_framework/js/jquery-3.3.1.min.js' %}"></script>
42+
<script src="{% static 'rest_framework/js/bootstrap.min.js' %}"></script>
4343
<script src="{% static 'rest_framework/docs/js/jquery.json-view.min.js' %}"></script>
4444
<script src="{% static 'rest_framework/docs/js/api.js' %}"></script>
4545
<script>

0 commit comments

Comments
 (0)