From da19c0b4ad97fb9089e6988bb97488e0cf2e6702 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Tue, 23 Apr 2019 11:26:36 +0100
Subject: [PATCH] Remove bullets from lists in tables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I think this is something we inherited from the Digital Marketplace
code. We only use this for organisation settings are the moment, but
the list markers are redundant because each item will never wrap onto a
new line; it will truncate instead. Still keeps a little sliver of
spacing just so it doesn’t look like a paragraph.
---
 app/assets/stylesheets/components/table.scss                | 4 ++++
 app/templates/components/table.html                         | 2 +-
 .../views/organisations/organisation/settings/index.html    | 2 +-
 tests/app/main/views/test_send.py                           | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss
index f47160917..c757c18da 100644
--- a/app/assets/stylesheets/components/table.scss
+++ b/app/assets/stylesheets/components/table.scss
@@ -85,6 +85,10 @@
       text-overflow: ellipsis;
     }
 
+    ul li {
+      margin-bottom: 5px;
+    }
+
   }
 
 }
diff --git a/app/templates/components/table.html b/app/templates/components/table.html
index c5708512c..c5171c02a 100644
--- a/app/templates/components/table.html
+++ b/app/templates/components/table.html
@@ -90,7 +90,7 @@
 {% macro text_field(text, status='', truncate=false) -%}
   {% call field(status=status) %}
     {% if text is iterable and text is not string %}
-      <ul class="list list-bullet">
+      <ul>
         {% for item in text %}
           {% if item %}
             <li>{{ item }}</li>
diff --git a/app/templates/views/organisations/organisation/settings/index.html b/app/templates/views/organisations/organisation/settings/index.html
index f1f6c5a54..a08f70d32 100644
--- a/app/templates/views/organisations/organisation/settings/index.html
+++ b/app/templates/views/organisations/organisation/settings/index.html
@@ -29,7 +29,7 @@
 
   {% if current_user.platform_admin %}
     <h2 class="heading-medium">Platform admin settings</h2>
-    <div class="bottom-gutter-3-2 settings-table body-copy-table">
+    <div class="settings-table body-copy-table">
       {% call mapping_table(
         caption='Platform admin settings',
         field_headings=['Label', 'Value', 'Action'],
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 3fa335965..5f0cc7a37 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -661,7 +661,7 @@ def test_upload_valid_csv_shows_preview_and_table(
             (
                 '<td class="table-field-center-aligned"> '
                 '<div class="table-field-status-default"> '
-                '<ul class="list list-bullet"> '
+                '<ul> '
                 '<li>foo</li> <li>foo</li> <li>foo</li> '
                 '</ul> '
                 '</div> '
@@ -674,7 +674,7 @@ def test_upload_valid_csv_shows_preview_and_table(
             (
                 '<td class="table-field-center-aligned"> '
                 '<div class="table-field-status-default"> '
-                '<ul class="list list-bullet"> '
+                '<ul> '
                 '<li>foo</li> <li>foo</li> <li>foo</li> '
                 '</ul> '
                 '</div> '
@@ -687,7 +687,7 @@ def test_upload_valid_csv_shows_preview_and_table(
             (
                 '<td class="table-field-center-aligned"> '
                 '<div class="table-field-status-default"> '
-                '<ul class="list list-bullet"> '
+                '<ul> '
                 '<li>foo</li> <li>foo</li> '
                 '</ul> '
                 '</div> '