Skip to content
Snippets Groups Projects
Commit 1727d4aa authored by Benjamin Hättasch's avatar Benjamin Hättasch Committed by Nadja Geisler
Browse files

Upgrade Django to 3.2

Bump to latest version of Django 3.2
Fix dark theme issue by fixing the order of css imports in admin
Cleanup admin login template (remove copied code as far as possible)
parent f36a9ec9
No related branches found
No related tags found
1 merge request!134Upgrade Django to 3.2
{% extends "admin/base_site.html" %}
{% extends "admin/login.html" %}
{% load i18n static %}
{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}">
{{ form.media }}
{% endblock %}
{% block bodyclass %}{{ block.super }} login{% endblock %}
{% block usertools %}{% endblock %}
{% block nav-global %}{% endblock %}
{% block nav-sidebar %}{% endblock %}
{% block content_title %}{% endblock %}
{% block breadcrumbs %}{% endblock %}
{% block content %}
{% if form.errors and not form.non_field_errors %}
......
Django==3.1.8
Django==3.2.16
django-bootstrap4==2.3.1
django-fontawesome-5==1.0.18
django-split-settings==1.0.1
......
/*
Load both the django admin base style and bootstrap -- but make sure bootstrap is loaded first to override all critical theme settings from bootstrap with the default admin style.
This especially fixes the dark theme.
*/
@import "/static/common/css/bootstrap.css";
@import "../../admin/css/base.css";
......@@ -4,6 +4,8 @@
{% load fontawesome_5 %}
{% load static %}
{% block stylesheet %}{% static "common/css/admin-bootstrap.css" %}{% endblock %}
{% block extrastyle %}
{% if not debug %}
<link rel="stylesheet" type="text/css" href="{% static "common/css/admin-color.css" %}"/>
......@@ -12,7 +14,6 @@
{% block extrahead %}
<!-- Load bootstrap, jquery and fontawesome-->
{% bootstrap_css %}
{% bootstrap_javascript jquery=True %}
{% fontawesome_5_static %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment