Merge pull request #5216 from onepercentclub/bugfix/BB-20400-impact-i…

…cons Fix impact icon selector
onepercentclub · Aug 30, 2022 · 9a58a29 · 9a58a29
2 parents 51a51e3 + 84d2de9
commit 9a58a29
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/bluebottle/bluebottle_dashboard/static/jet/css/themes/goodup/_extra.scss b/bluebottle/bluebottle_dashboard/static/jet/css/themes/goodup/_extra.scss
@@ -91,3 +91,25 @@ span.help + p.help {
     padding-left: 0;
   }
 }
+
+ul.icon-picker {
+  columns: 4;
+  width: 300px;
+  li {
+    padding: 8px;
+    input {
+      display: none;
+      &:checked + img{
+        background-color: #64A03C;
+        border: 2px solid #409020;
+      }
+    }
+    img{
+      border: 2px solid #dddddd;
+      width: 50px;
+      height: 50px;
+      padding: 8px;
+      cursor: pointer;
+    }
+  }
+}
diff --git a/bluebottle/bluebottle_dashboard/static/jet/css/themes/goodup/base.css b/bluebottle/bluebottle_dashboard/static/jet/css/themes/goodup/base.css
diff --git a/bluebottle/bluebottle_dashboard/static/jet/css/themes/goodup/base.css.map b/bluebottle/bluebottle_dashboard/static/jet/css/themes/goodup/base.css.map
diff --git a/bluebottle/statistics/templates/admin/impact/select_icon.html b/bluebottle/statistics/templates/admin/impact/select_icon.html
@@ -3,7 +3,7 @@
         {% for group, options, index in widget.optgroups %}
             {% for option in options %}
                 <li>
-                    {% include option.template_name with widget=option %}
+                    {% include option.template_name with wrap_label=True widget=option %}
                 </li>
             {% endfor %}
         {% endfor %}

diff --git a/bluebottle/statistics/templates/admin/impact/select_icon_option.html b/bluebottle/statistics/templates/admin/impact/select_icon_option.html
@@ -7,9 +7,7 @@
     {% if widget.value %}
         <img src="/goodicons/impact/{{ widget.value }}-impact.svg" alt="{{ widget.label }}">
     {% else %}
-        <span>
-            {% trans "Default" %}
-        </span>
+        <img src="/goodicons/impact/default-impact.svg" alt="Default">
     {% endif %}
     </label>
 {% endif %}