Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Bootstrap, AdminLTE & FontAwesome #552

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ them as quickly as I would like, but im trying to get through them all now, hope
![Django Versions](https://img.shields.io/badge/django-%3E=4.2-brightgreen)
[![Coverage Status](https://coveralls.io/repos/github/farridav/django-jazzmin/badge.svg?branch=master)](https://coveralls.io/github/farridav/django-jazzmin?branch=master)

Drop-in theme for django admin, that utilises AdminLTE 3 & Bootstrap 4 to make yo' admin look jazzy
Drop-in theme for django admin, that utilises AdminLTE 3.2 & Bootstrap 5 to make yo' admin look jazzy

## Installation

Expand All @@ -42,12 +42,12 @@ See [Documentation](https://django-jazzmin.readthedocs.io) or [Test App](https:/
- Customisable top menu
- Customisable user menu
- 4 different Change form templates (horizontal tabs, vertical tabs, carousel, collapsible)
- Bootstrap 4 modal (instead of the old popup window, optional)
- Bootstrap 5 modal (instead of the old popup window, optional)
- Search bar for any given model admin
- Customisable UI (via Live UI changes, or custom CSS/JS)
- Responsive
- Select2 drop-downs
- Bootstrap 4 & AdminLTE UI components
- Bootstrap 5 & AdminLTE UI components
- Using the latest [adminlte](https://adminlte.io/) + [bootstrap](https://getbootstrap.com/)

## Screenshots
Expand Down Expand Up @@ -123,5 +123,5 @@ project were possible, but this project has taken a different direction.
The javascript modal implementation uses some code from [django-admin-interface](https://github.com/fabiocaccamo/django-admin-interface/blob/master/admin_interface/static/admin/js/popup_response.js), so thanks to @fabiocaccamo for original work

- Based on AdminLTE 3: <https://adminlte.io/>
- Using Bootstrap 4: <https://getbootstrap.com/>
- Using Bootstrap 5: <https://getbootstrap.com/>
- Using Font Awesome 5: <https://fontawesome.com/>
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ customise, including a built-in UI customizer

- Drop-in admin skin, all configuration optional
- Select2 drop-downs
- Bootstrap 4 & AdminLTE UI components
- Bootstrap 5 & AdminLTE UI components
- Search bar for any given model admin
- Modal windows instead of popups
- Customisable side menu
Expand Down Expand Up @@ -77,5 +77,5 @@ deserved its own package, big thanks to @wuyue92tree for all of his initial hard
project were possible, but this project is taking a slightly different direction.

- Based on AdminLTE 3: <https://adminlte.io/>
- Using Bootstrap 4: <https://getbootstrap.com/>
- Using Bootstrap 5: <https://getbootstrap.com/>
- Using Font Awesome 5: <https://fontawesome.com/>
6 changes: 3 additions & 3 deletions jazzmin/static/vendor/adminlte/css/adminlte.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jazzmin/static/vendor/adminlte/css/adminlte.min.css.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions jazzmin/static/vendor/adminlte/js/adminlte.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jazzmin/static/vendor/adminlte/js/adminlte.min.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions jazzmin/static/vendor/bootstrap/js/bootstrap.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jazzmin/static/vendor/bootstrap/js/bootstrap.min.js.map

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions jazzmin/static/vendor/fontawesome-free/css/all.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion jazzmin/templates/admin/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ <h4 class="modal-title">{% trans 'UI Configuration' %}</h4>

<!-- jQuery -->
<script src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
<!-- Bootstrap 4 -->
<!-- Bootstrap 5 -->
<script src="{% static "vendor/bootstrap/js/bootstrap.min.js" %}"></script>
<!-- AdminLTE App -->
<script src="{% static "vendor/adminlte/js/adminlte.min.js" %}"></script>
Expand Down
2 changes: 1 addition & 1 deletion jazzmin/templates/registration/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ <h1>

<!-- jQuery -->
<script src="{% static "admin/js/vendor/jquery/jquery.js" %}"></script>
<!-- Bootstrap 4 -->
<!-- Bootstrap 5 -->
<script src="{% static 'vendor/bootstrap/js/bootstrap.min.js' %}"></script>
<!-- AdminLTE App -->
<script src="{% static 'vendor/adminlte/js/adminlte.min.js' %}"></script>
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool.poetry]
name = "django-jazzmin"
version = "0.0.0"
description = "Drop-in theme for django admin, that utilises AdminLTE 3 & Bootstrap 4 to make yo' admin look jazzy"
description = "Drop-in theme for django admin, that utilises AdminLTE 3 & Bootstrap 5 to make yo' admin look jazzy"
license = "MIT"
authors = ["Shipit <[email protected]>"]
maintainers = ["Shipit <[email protected]>"]
Expand Down
Loading