fix: Remove flex display for submit-row (as of Django 4.2) (#507)

* Fix: avoid `<html data-theme="undefined">` * Fix: Remove display flex for submit row * Update assets * fix: widget-wrappers
django-cms · Jan 13, 2024 · 1428c0d · 1428c0d
1 parent 529e2f4
commit 1428c0d
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog
 =========
 
+unreleased
+==========
+
+* Adjiust flex-container in newer Django versions (4.2+) for submit row and admin header
+
 3.2.7 (2024-01-04)
 ==================
 
@@ -17,6 +22,7 @@ Changelog
 * Fix broken color input (#429)
 * Add Django as requirement in setup.py (#423)
 
+
 3.2.5 (2023-08-22)
 ==================
 

diff --git a/djangocms_admin_style/sass/components/_base.scss b/djangocms_admin_style/sass/components/_base.scss
@@ -82,7 +82,24 @@ a.btn {
     @include button-variant($btn-default-color, $btn-default-bgcolor, $btn-default-border, true);
 }
 
+.button.default, input[type=submit].default, .submit-row input.default {
+    float: right;
+}
+
 .submit-row {
+    display: block;
+    text-align: right;
+    input {
+        display: inline-block;
+    }
+    .deletelink-box, .deletelink {
+        display: inline-block;
+        float: left;
+    }
+    a.deletelink {
+        margin-left: 10px;
+        display: inline-block;
+    }
     .btn {
         padding: 10px 20px !important;
         height: 36px !important;

diff --git a/djangocms_admin_style/sass/components/_forms.scss b/djangocms_admin_style/sass/components/_forms.scss
@@ -905,6 +905,7 @@ form select[multiple] {
 .related-widget-wrapper {
     // required in admin/aldryn_newsblog/article/add to ensure outline is not cut off #249
     overflow: visible;
+    display: block;
     width: 100%;
     &.widget-wrapper-links-1 {
         select, .select2 {

diff --git a/djangocms_admin_style/sass/components/_header.scss b/djangocms_admin_style/sass/components/_header.scss
@@ -18,6 +18,7 @@
     box-shadow: $toolbar-shadow;
     z-index: z(header);
     #branding {
+        display: block;
         width: 100%;
         h1 {
             // hides h1 because of text appears in list on dropdown menu

diff --git a/djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css b/djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css
diff --git a/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.eot b/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.eot
diff --git a/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.ttf b/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.ttf
diff --git a/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.woff b/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.woff
diff --git a/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.woff2 b/djangocms_admin_style/static/djangocms_admin_style/fonts/django-admin-iconfont.woff2