mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-01 17:49:12 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #36283 -- Reverted "Fixed #35798, Refs #31641 -- Prevented admin navigation sidebar loading flicker."

Browse Source 
This reverts commit 747b417a220b0412ed806001a383959449aac6da that caused
a visual regression when both navigation and filter sidebars are
visible.
This commit is contained in:
Mariusz Felisiak 2025-03-31 23:00:37 +02:00 committed by Sarah Boyce
parent 6b32506739
commit 12385b4fa7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/contrib/admin/templates/admin/base.html
View File

@ -10,6 +10,7 @@
{% endblock %}
{% if not is_popup and is_nav_sidebar_enabled %}
<link rel="stylesheet" href="{% static "admin/css/nav_sidebar.css" %}">
<script src="{% static 'admin/js/nav_sidebar.js' %}" defer></script>
{% endif %}
{% block extrastyle %}{% endblock %}
{% if LANGUAGE_BIDI %}<link rel="stylesheet" href="{% block stylesheet_rtl %}{% static "admin/css/rtl.css" %}{% endblock %}">{% endif %}

3
django/contrib/admin/templates/admin/nav_sidebar.html
View File

@ -1,4 +1,4 @@
{% load i18n static %}
{% load i18n %}
<button class="sticky toggle-nav-sidebar" id="toggle-nav-sidebar" aria-label="{% translate 'Toggle navigation' %}"></button>
<nav class="sticky" id="nav-sidebar" aria-label="{% translate 'Sidebar' %}">
<input type="search" id="nav-filter"
@ -6,4 +6,3 @@
aria-label="{% translate 'Filter navigation items' %}">
{% include 'admin/app_list.html' with app_list=available_apps show_changelinks=False %}
</nav>
<script src="{% static 'admin/js/nav_sidebar.js' %}"></script>