From 5a22b0b4aa5292a5602dd8d8ab1907c8e0a6c86a Mon Sep 17 00:00:00 2001 From: Amir Ajorloo Date: Wed, 3 Feb 2021 08:34:49 +0330 Subject: [PATCH] Add sticky-pagination styles. Fix trailing whitespace issue in models. --- admin_interface/models.py | 1 - admin_interface/templates/admin/base_site.html | 2 +- .../admin_interface/css/admin-interface-fix.css | 15 ++++++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/admin_interface/models.py b/admin_interface/models.py index 69c0624..c7104fe 100644 --- a/admin_interface/models.py +++ b/admin_interface/models.py @@ -302,7 +302,6 @@ class Theme(models.Model): form_submit_sticky = models.BooleanField( default=False, verbose_name=_('sticky submit')) - form_pagination_sticky = models.BooleanField( default=False, verbose_name=_('sticky pagination')) diff --git a/admin_interface/templates/admin/base_site.html b/admin_interface/templates/admin/base_site.html index 10ca849..27f4cab 100644 --- a/admin_interface/templates/admin/base_site.html +++ b/admin_interface/templates/admin/base_site.html @@ -53,7 +53,7 @@ https://github.com/fabiocaccamo/django-admin-interface {% endblock %} {% block bodyclass %}admin-interface flat-theme {% get_admin_interface_theme as theme %}{% if theme.name %}{{ -theme.name|slugify }}-theme{% endif %}{% if theme.form_submit_sticky %} sticky-submit {% endif %}{% endblock %} +theme.name|slugify }}-theme{% endif %}{% if theme.form_submit_sticky %} sticky-submit {% endif %}{% if theme.form_pagination_sticky %} sticky-pagination {% endif %}{% endblock %} {% block branding %} {% get_admin_interface_theme as theme %} diff --git a/admin_interface/templates/admin_interface/css/admin-interface-fix.css b/admin_interface/templates/admin_interface/css/admin-interface-fix.css index 73c7e87..afede60 100644 --- a/admin_interface/templates/admin_interface/css/admin-interface-fix.css +++ b/admin_interface/templates/admin_interface/css/admin-interface-fix.css @@ -412,11 +412,13 @@ body.admin-interface .paginator a.showall:visited { max-width: 100%; } -.admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content { +.admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content, +.admin-interface.sticky-pagination.change-list:not(.popup) #main > #nav-sidebar + .content { padding-bottom: 4rem; } -.admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content form fieldset + .submit-row { +.admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content form fieldset + .submit-row, +.admin-interface.sticky-pagination.change-list:not(.popup) #main > #nav-sidebar + .content form .results + .paginator { width: 100%; max-width: calc(100% - 28px); bottom: 0; @@ -463,7 +465,8 @@ body.admin-interface .paginator a.showall:visited { max-width: calc(100% - 360px); } - .admin-interface.sticky-submit.change-form:not(.popup) #main.shifted > #nav-sidebar + .content .submit-row { + .admin-interface.sticky-submit.change-form:not(.popup) #main.shifted > #nav-sidebar + .content form fieldset + .submit-row, + .admin-interface.sticky-pagination.change-list:not(.popup) #main.shifted > #nav-sidebar + .content form .results + .paginator { max-width: calc(100% - 388px); right: 0; bottom: 0; @@ -557,11 +560,13 @@ body.admin-interface .paginator a.showall:visited { margin-top: 5px; } - .admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content { + .admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content, + .admin-interface.sticky-pagination.change-form:not(.popup) #main > #nav-sidebar + .content { padding-bottom: 12rem; } - .admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content .submit-row { + .admin-interface.sticky-submit.change-form:not(.popup) #main > #nav-sidebar + .content .submit-row, + .admin-interface.sticky-pagination.change-list:not(.popup) #main > #nav-sidebar + .content form .results + .paginator { max-width: calc(100% - 20px); } } \ No newline at end of file