fix: sometimes data-theme="undefined" gets added to the <html> tag (

#498) * Fix: avoid `<html data-theme="undefined">` * Add bundle * Fix broken color input * Add Django as dependency * Fix: `.flex-container` styling * Update CHANGELOG.rst * Bump to 3.2.6
django-cms · Sep 18, 2023 · 02baca3 · 02baca3
1 parent c303359
commit 02baca3
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 11 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Changelog
 =========
 
+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
@@ -139,6 +139,9 @@ form {
             }
         }
     }
+    input[type="color"] {
+        width: revert;
+    }
     button,
     input[type="text"],
     input[type="email"],
@@ -981,3 +984,10 @@ form select[multiple] {
 .related-widget-wrapper-link:link:hover {
     opacity: 1;
 }
+
+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
diff --git a/djangocms_admin_style/static/djangocms_admin_style/js/dist/bundle.adminstyle.min.js b/djangocms_admin_style/static/djangocms_admin_style/js/dist/bundle.adminstyle.min.js
diff --git a/djangocms_admin_style/static/djangocms_admin_style/js/modules/dark-mode.js b/djangocms_admin_style/static/djangocms_admin_style/js/modules/dark-mode.js
@@ -23,6 +23,10 @@ function getTopWindow() {
 function getColorSchemeFromSettings(CMS) {
     var colorScheme;
 
+    if (!CMS) {
+        return;
+    }
+
     if (CMS.settings && CMS.settings.color_scheme) {
         // Use color_scheme from settings.py
         colorScheme = CMS.settings.color_scheme;
@@ -54,16 +58,12 @@ function darkModeSettings() {
                     // CMS not loaded: set color scheme for admin site according to settings
                     colorScheme = JSON.parse(localStorage.getItem('cms_cookie') || '{}').color_scheme;
                 }
-
-                if (colorScheme === 'auto' || colorScheme === undefined) {
-                    document.documentElement.dataset.theme = 'auto';
-                } else {
-                    document.documentElement.dataset.theme = colorScheme;
-                }
             }
         }
     }
-    document.documentElement.dataset.theme = colorScheme;
+    if (colorScheme) {
+        document.documentElement.dataset.theme = colorScheme;
+    }
 }
 
 module.exports = darkModeSettings;
diff --git a/setup.py b/setup.py
@@ -6,7 +6,9 @@
 from djangocms_admin_style import __version__
 
 
-REQUIREMENTS = []
+REQUIREMENTS = [
+    "Django",
+]
 
 
 CLASSIFIERS = [