From 40cd1d23d52326133541eafd4ae123e5d2fcd829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 19 Dec 2022 15:11:44 +0100
Subject: [PATCH] maps: keep marker colour widgets aligned (#72084)

---
 .../templates/maps/colour_or_text_input.html     | 16 +++++++++-------
 combo/manager/static/css/combo.manager.scss      |  7 +++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/combo/apps/maps/templates/maps/colour_or_text_input.html b/combo/apps/maps/templates/maps/colour_or_text_input.html
index c0b97104..30334020 100644
--- a/combo/apps/maps/templates/maps/colour_or_text_input.html
+++ b/combo/apps/maps/templates/maps/colour_or_text_input.html
@@ -1,12 +1,14 @@
 {% load i18n %}
 {% with widget_value=widget.value|stringformat:'s' %}
-  {% spaceless %}
-    <span id="{{ widget.name }}-joined-buttons" class="gadjo-joined-buttons">
-      <button data-mode="color" aria-pressed="{% if widget.value is None or widget_value|slice:":1" == '#' %}true{% else %}false{% endif %}" role="button">{% trans "Fixed" %}</button>
-      <button data-mode="text" aria-pressed="{% if widget.value != None and widget_value|slice:":1" != '#' %}true{% else %}false{% endif %}" role="button">{% trans "Variable" %}</button>
-    </span>
-  {% endspaceless %}
-  <input id="{{ widget.name }}-input" {% if widget.value is None or widget_value|slice:":1" == '#' %}type="color"{% else %}type="text"{% endif %} name="{{ widget.name }}"{% if widget.value != None %} value="{{ widget_value }}"{% endif %}{% include "django/forms/widgets/attrs.html" %}>
+  <div class="colour-or-text-input">
+    {% spaceless %}
+      <span id="{{ widget.name }}-joined-buttons" class="gadjo-joined-buttons">
+        <button data-mode="color" aria-pressed="{% if widget.value is None or widget_value|slice:":1" == '#' %}true{% else %}false{% endif %}" role="button">{% trans "Fixed" %}</button>
+        <button data-mode="text" aria-pressed="{% if widget.value != None and widget_value|slice:":1" != '#' %}true{% else %}false{% endif %}" role="button">{% trans "Variable" %}</button>
+      </span>
+    {% endspaceless %}
+    <input id="{{ widget.name }}-input" {% if widget.value is None or widget_value|slice:":1" == '#' %}type="color"{% else %}type="text"{% endif %} name="{{ widget.name }}"{% if widget.value != None %} value="{{ widget_value }}"{% endif %}{% include "django/forms/widgets/attrs.html" %}>
+  </div>
 {% endwith %}
 <script>
   $(function() {
diff --git a/combo/manager/static/css/combo.manager.scss b/combo/manager/static/css/combo.manager.scss
index 093648fe..0edacf1e 100644
--- a/combo/manager/static/css/combo.manager.scss
+++ b/combo/manager/static/css/combo.manager.scss
@@ -678,6 +678,13 @@ form .choices {
 	justify-content: space-between;
 }
 
+.colour-or-text-input {
+	display: flex;
+	input {
+		margin-left: 0.5em;
+	}
+}
+
 #marker_colour-joined-buttons {
 	margin: 4px 0;
 }
-- 
2.39.2