fix: Minimum width for select2 box (#198)

django-cms · Mar 21, 2024 · b9d5ebe · b9d5ebe
1 parent 6a6ee2a
commit b9d5ebe
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/djangocms_frontend/contrib/badge/forms.py b/djangocms_frontend/contrib/badge/forms.py
@@ -32,6 +32,7 @@ class Meta:
     badge_text = forms.CharField(
         label=_("Badge text"),
         max_length=255,
+        widget=forms.TextInput(attrs={"class": "js-prepopulate-selected-text"}),
     )
     badge_context = forms.ChoiceField(
         label=_("Context"),

diff --git a/djangocms_frontend/contrib/link/forms.py b/djangocms_frontend/contrib/link/forms.py
@@ -344,6 +344,7 @@ class Meta:
     name = forms.CharField(
         label=_("Display name"),
         required=False,
+        widget=forms.TextInput(attrs={"class": "js-prepopulate-selected-text"}),
     )
     template = forms.ChoiceField(
         label=_("Layout"),

diff --git a/djangocms_frontend/contrib/link/templates/djangocms_frontend/admin/link.html b/djangocms_frontend/contrib/link/templates/djangocms_frontend/admin/link.html
@@ -5,11 +5,14 @@
     {{ block.super }}
     <style> {# Bugfix for Django admin styling #}
         @media screen {
-        .change-form .select2-dropdown {
-            background: var(--body-bg);
-            border: 1px solid var(--border-color);
+            .change-form .select2-dropdown {
+                background: var(--body-bg);
+                border: 1px solid var(--border-color);
+            }
+        }
+        select {
+            min-width: 160px;
         }
-    }
     </style>
     <script src="{% static 'djangocms_frontend/js/bundle.link.js' %}"></script>
 {% endblock %}

diff --git a/djangocms_frontend/static/djangocms_frontend/css/base.css b/djangocms_frontend/static/djangocms_frontend/css/base.css
diff --git a/djangocms_frontend/templates/djangocms_frontend/admin/includes/fieldset.html b/djangocms_frontend/templates/djangocms_frontend/admin/includes/fieldset.html
@@ -1,5 +1,5 @@
 <fieldset class="module aligned {{ fieldset.classes|cut:"collapse" }}">
-    {% if fieldset.name and not "collapse" in fieldset.classes %}<h2>{{ fieldset.name }}</h2>{% endif %}
+    {% if fieldset.name %}<h2>{{ fieldset.name }}</h2>{% endif %}
     {% if fieldset.description %}
         <div class="description">{{ fieldset.description|safe }}</div>
     {% endif %}
@@ -32,4 +32,3 @@
         </div>
     {% endfor %}
 </fieldset>
-
diff --git a/private/sass/components/_icon-picker.scss b/private/sass/components/_icon-picker.scss
@@ -3,9 +3,7 @@
     display: inline-block;
     .icon-container {
         position: relative;
-        margin-bottom: 0.5em;
-        margin-left: auto;
-        margin-right: auto;
+        margin: 0.5em auto;
         width: 7em;
         height: 7em;
         border: 1px var(--dca-gray-light, var(--border-color, lightgray)) solid;