From a6bb58e3154db8d71876b4d52005477f12589736 Mon Sep 17 00:00:00 2001
From: Zarino Zappia <mail@zarino.co.uk>
Date: Wed, 1 May 2019 16:20:17 +0100
Subject: Tidy up "Categories:" checkbox lists on admin pages

No need for bullets here, nor margins above/below each label.
---
 templates/web/base/admin/category-checkboxes.html    | 4 ++--
 templates/web/bromley/admin/category-checkboxes.html | 4 ++--
 web/cobrands/sass/_admin.scss                        | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/templates/web/base/admin/category-checkboxes.html b/templates/web/base/admin/category-checkboxes.html
index f2167e955..fb5e39695 100644
--- a/templates/web/base/admin/category-checkboxes.html
+++ b/templates/web/base/admin/category-checkboxes.html
@@ -1,7 +1,7 @@
   <p>
     <strong>[% loc('Categories:') %]</strong>
   </p>
-  <ul>
+  <ul class="no-bullets no-margin">
     <li>
       [% loc('Select:') %]
       <a href="#" data-select-all>[% loc('all') %]</a> /
@@ -9,7 +9,7 @@
     </li>
     [% FOR contact IN contacts %]
       <li>
-        <label title="[% contact.email | html %]">
+        <label class="inline" title="[% contact.email | html %]">
           <input type="checkbox" name="contacts[[% contact.id %]]" [% 'checked' IF contact.active %]/>
           [% contact.category %]
         </label>
diff --git a/templates/web/bromley/admin/category-checkboxes.html b/templates/web/bromley/admin/category-checkboxes.html
index ce4b489e8..295a1db26 100644
--- a/templates/web/bromley/admin/category-checkboxes.html
+++ b/templates/web/bromley/admin/category-checkboxes.html
@@ -1,7 +1,7 @@
   <p>
     <strong>[% loc('Categories:') %]</strong>
   </p>
-  <ul>
+  <ul class="no-bullets no-margin">
     <li>
       [% loc('Select:') %]
       <a href="#" data-select-all>[% loc('all') %]</a> /
@@ -9,7 +9,7 @@
     </li>
     [% FOR contact IN c.cobrand.add_admin_subcategories # Bromley-specific function %]
       <li>
-        <label title="[% contact.email | html %]">
+        <label class="inline" title="[% contact.email | html %]">
           <input type="checkbox" name="contacts[[% contact.id %]]" [% 'checked' IF contact.active %]/>
           [% contact.category %]
         </label>
diff --git a/web/cobrands/sass/_admin.scss b/web/cobrands/sass/_admin.scss
index 0a9789161..8b701cfc6 100644
--- a/web/cobrands/sass/_admin.scss
+++ b/web/cobrands/sass/_admin.scss
@@ -67,6 +67,9 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
         list-style: none;
       }
     }
+    .no-margin {
+      margin: 0;
+    }
 }
 
 .js #admin_contacts tr.is-deleted {
-- 
cgit v1.2.3