From a36f38edb8aba258d51e2b3941dc068354959148 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 4 Nov 2016 09:50:11 +0000
Subject: [PATCH] Remove banner for trial mode message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The yellow banner didn’t make this information much more noticeable,
and it made some people miss the request to go live link because it
wasn’t blue.

This commit brings the design back to where it was as of this PR:
https://github.com/alphagov/notifications-admin/pull/904
---
 app/assets/stylesheets/_grids.scss        |  4 +++
 app/templates/views/service-settings.html | 34 +++++++++++------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss
index 00f8809e6..cdd68defe 100644
--- a/app/assets/stylesheets/_grids.scss
+++ b/app/assets/stylesheets/_grids.scss
@@ -35,6 +35,10 @@
   margin-bottom: $gutter-half;
 }
 
+.bottom-gutter-3-2 {
+  margin-bottom: $gutter * 3/2;
+}
+
 .bottom-gutter-2 {
   margin-bottom: $gutter * 2;
 }
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 3fda72be4..03746a982 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -11,24 +11,7 @@
 
     <h1 class="heading-large">Settings</h1>
 
-    {% if current_service.restricted %}
-      {% call banner_wrapper(type='warning') %}
-        <h2 class="heading-medium">Your service is in trial mode</h2>
-
-        <ul class='list list-bullet'>
-          <li>you can only send messages to yourself</li>
-          <li>you can add people to your team, then you can send messages to them too</li>
-          <li>you can only send 50 messages per day</li>
-        </ul>
-
-        <p>
-          To remove these restrictions
-          <a href="{{ url_for('.service_request_to_go_live', service_id=current_service.id) }}">request to go live</a>.
-        </p>
-      {% endcall %}
-    {% endif %}
-
-    <div class="bottom-gutter-2">
+    <div class="bottom-gutter-3-2">
 
       {% call mapping_table(
         caption='Settings',
@@ -57,6 +40,21 @@
       {% endcall %}
     </div>
 
+    {% if current_service.restricted %}
+      <h2 class="heading-medium">Your service is in trial mode</h2>
+
+      <ul class='list list-bullet'>
+        <li>you can only send messages to yourself</li>
+        <li>you can add people to your team, then you can send messages to them too</li>
+        <li>you can only send 50 messages per day</li>
+      </ul>
+
+      <p>
+        To remove these restrictions
+        <a href="{{ url_for('.service_request_to_go_live', service_id=current_service.id) }}">request to go live</a>.
+      </p>
+    {% endif %}
+
     {% if current_user.has_permissions([], admin_override=True) %}
 
       <h2 class="heading-medium">Platform admin settings</h2>