Merge branch 'master' into feat/add-dj42-admin-support

django-cms · Oct 24, 2023 · 4569433 · 4569433
2 parents 4abed26 + ae6ec18
commit 4569433
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,13 +9,13 @@ ci:
 
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+    rev: v3.14.0
     hooks:
       - id: pyupgrade
         args: ["--py37-plus"]
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: '1.14.1'
+    rev: '1.15.0'
     hooks:
       - id: django-upgrade
         args: [--target-version, "2.2"]

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -10,6 +10,14 @@ unreleased
 * Add Django as requirement in setup.py (#423)
 * Adjust flex-container in newer Django versions
 
+3.2.6 (2023-09-18)
+==================
+
+* Fix bug which adds 'data-theme="undefined"' to admin html tag
+* Fix broken styling with `.flex-container`
+* 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/__init__.py b/djangocms_admin_style/__init__.py
@@ -16,4 +16,4 @@
 10. Publish the release when ready
 11. Github actions will publish the new package to pypi
 """
-__version__ = '3.2.5'
+__version__ = '3.2.6'
diff --git a/djangocms_admin_style/sass/components/_forms.scss b/djangocms_admin_style/sass/components/_forms.scss
@@ -996,6 +996,9 @@ form select[multiple] {
     opacity: 1;
 }
 
-fieldset .fieldBox {
-    margin-right: 0;
+form .flex-container {
+    display: block;
+    div.fieldBox {
+        display: inline-block;
+    }
 }
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