Merge branch 'django-cms:master' into master

Author: fsbraun

djangocms_frontend/contrib/link/forms.py

@@ -114,7 +114,10 @@ def build_attrs(self, base_attrs, extra_attrs=None):
         return attrs
 
     def optgroups(self, name, value, attr=None):
-        return super(forms.Select, self).optgroups(name, value)
+        groups = super(forms.Select, self).optgroups(name, value)
+        if not self.is_required:
+            groups[0][1].insert(0, self.create_option(name, "", "", False, 0))
+        return groups
 
 
 class SmartLinkField(forms.ChoiceField):

djangocms_frontend/contrib/utilities/frameworks/bootstrap5.py

@@ -6,7 +6,7 @@ def render(self, context, instance, placeholder):
             )
         else:
             instance.add_classes(
-                f"{instance.space_property}{instance.space_sides}-{ instance.space_device }-{instance.space_size}"
+                f"{instance.space_property}{instance.space_sides}-{instance.space_device}-{instance.space_size}"
             )
         return super().render(context, instance, placeholder)
 

djangocms_frontend/static/djangocms_frontend/css/base.css

@@ -30,6 +30,10 @@
     padding: 0;
     min-width: 800px;
 
+    > div > div:not([class]) {  // fix a quirk of djangocms-admin-style
+        width: unset  !important;
+        max-width: unset  !important;
+    }
     .field-box:first-child {
         width: 115px !important;
     }
@@ -39,6 +43,7 @@
         box-sizing: content-box;
         width: 86px !important;
         flex: none;
+        display: block;
         padding: 15px 10px;
         margin: 0 !important;
         border-bottom: 1px solid #eee;

private/sass/components/_grid-layout.scss

@@ -119,8 +119,8 @@ def test_plugin(self):
     def test_smart_link_field(self):
         slf = SmartLinkField()
         choices = get_choices(None)
-        self.assertEqual("example.com", choices[0][0])  # Site name
-        self.assertIn(("2-1", "home"), choices[0][1])
+        self.assertEqual("example.com", choices[1][0])  # Site name
+        self.assertIn(("2-1", "home"), choices[1][1])
 
         cleaned = slf.clean("2-1")
         self.assertEqual(dict(model="cms.page", pk=1), cleaned)