From 58c08ad89b347da2d4be436287ae4e02a0200b2e Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Wed, 11 Dec 2019 15:29:50 +0000
Subject: [PATCH] Replace browse-list links

---
 .../stylesheets/components/browse-list.scss   | 20 +++++++------------
 app/templates/components/browse-list.html     |  2 +-
 app/templates/views/choose-account.html       |  6 +++---
 .../find-services/find-services-by-name.html  |  2 +-
 app/templates/views/inbound-sms-admin.html    |  4 ++--
 app/templates/views/organisations/index.html  |  2 +-
 6 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/components/browse-list.scss b/app/assets/stylesheets/components/browse-list.scss
index bc63bd9a6..b0d8255f7 100644
--- a/app/assets/stylesheets/components/browse-list.scss
+++ b/app/assets/stylesheets/components/browse-list.scss
@@ -16,22 +16,16 @@
     margin-bottom: $gutter-half;
   }
 
-  &-link {
-    @include bold-24;
+  &-link-destructive {
+    color: $error-colour;
 
-    &-destructive {
-      @include bold-24;
+    &:visited,
+    &:link {
       color: $error-colour;
+    }
 
-      &:visited,
-      &:link {
-        @include bold-24;
-        color: $error-colour;
-      }
-
-      &:hover {
-        color: $mellow-red;
-      }
+    &:hover {
+      color: $mellow-red;
     }
   }
 
diff --git a/app/templates/components/browse-list.html b/app/templates/components/browse-list.html
index 43ce53729..8d7b4aad6 100644
--- a/app/templates/components/browse-list.html
+++ b/app/templates/components/browse-list.html
@@ -5,7 +5,7 @@
         {% for item in items %}
           {% if item.title and item.link %}
             <li class="browse-list-item">
-              <a href="{{ item.link }}" class="govuk-link govuk-link--no-visited-state browse-list-link{% if item.destructive %}-destructive{% endif %}">{{ item.title }}</a>
+              <a href="{{ item.link }}" class="govuk-link govuk-link--no-visited-state{% if item.destructive %} browse-list-link-destructive{% endif %}">{{ item.title }}</a>
               {% if item.hint %}
                 <div class="browse-list-hint">
                   {{ item.hint }}
diff --git a/app/templates/views/choose-account.html b/app/templates/views/choose-account.html
index 2eeb04202..144696473 100644
--- a/app/templates/views/choose-account.html
+++ b/app/templates/views/choose-account.html
@@ -21,7 +21,7 @@
   {% endif %}
   {% for org in organisations %}
     <li class="browse-list-item">
-      <a href="{{ url_for('.organisation_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ org.name }}</a>
+      <a href="{{ url_for('.organisation_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state">{{ org.name }}</a>
       <p class="browse-list-hint">
         {{ org.count_of_live_services }}
         live service{% if org.count_of_live_services != 1 %}s{% endif %}
@@ -30,7 +30,7 @@
   {% endfor %}
   {% for service in services %}
     <li class="browse-list-item">
-      <a href="{{ url_for('.service_dashboard', service_id=service.id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service.name }}</a>
+      <a href="{{ url_for('.service_dashboard', service_id=service.id) }}" class="govuk-link govuk-link--no-visited-state">{{ service.name }}</a>
     </li>
   {% endfor %}
   {% if show_heading %}
@@ -64,7 +64,7 @@
         </div>
         <ul class="column-three-quarters">
           <li class="browse-list-item">
-            <a href="{{ url_for('.organisations') }}" class="govuk-link govuk-link--no-visited-state browse-list-link">All organisations</a>
+            <a href="{{ url_for('.organisations') }}" class="govuk-link govuk-link--no-visited-state">All organisations</a>
             <p class="browse-list-hint">
               {{ org_count|format_thousands }} organisations, {{ live_service_count|format_thousands }} live services
             </p>
diff --git a/app/templates/views/find-services/find-services-by-name.html b/app/templates/views/find-services/find-services-by-name.html
index a1fa28fda..2fbb8f402 100644
--- a/app/templates/views/find-services/find-services-by-name.html
+++ b/app/templates/views/find-services/find-services-by-name.html
@@ -43,7 +43,7 @@
     <ul>
     {% for service in services_found %}
       <li class="browse-list-item">
-        <a href="{{url_for('.service_dashboard', service_id=service.id)}}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service.name }}</a>
+        <a href="{{url_for('.service_dashboard', service_id=service.id)}}" class="govuk-link govuk-link--no-visited-state">{{ service.name }}</a>
       </li>
       <hr>
     {% endfor %}
diff --git a/app/templates/views/inbound-sms-admin.html b/app/templates/views/inbound-sms-admin.html
index 8a83b6313..bd3d8a26b 100644
--- a/app/templates/views/inbound-sms-admin.html
+++ b/app/templates/views/inbound-sms-admin.html
@@ -58,11 +58,11 @@ Inbound Numbers
               {% endif %}
               </th>
               <th style="font-weight:normal;">
-                  <a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ value.service.name }}</a>
+                  <a href="{{ url_for('main.service_dashboard', service_id=value.service.id) }}" class="govuk-link govuk-link--no-visited-state">{{ value.service.name }}</a>
               </th>
           </tr>
           {% endfor %}
           </tbody>
   </table>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/app/templates/views/organisations/index.html b/app/templates/views/organisations/index.html
index 59d7fcf88..49cd82200 100644
--- a/app/templates/views/organisations/index.html
+++ b/app/templates/views/organisations/index.html
@@ -31,7 +31,7 @@
           <ul>
             {% for org in organisations %}
               <li class="browse-list-item">
-                <a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ org.name }}</a>
+                <a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state">{{ org.name }}</a>
                 <p class="browse-list-hint">
                   {{ org.count_of_live_services }}
                   live service{% if org.count_of_live_services != 1 %}s{% endif %}