From 5597e63d44dc0da96c27b1bffa33a8626a8327c5 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 1 Feb 2019 15:45:38 +0000
Subject: [PATCH 1/4] Recalculate stickyness after API keys have rendered

---
 app/assets/javascripts/apiKey.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/apiKey.js b/app/assets/javascripts/apiKey.js
index 4b7889d97..79c2540b4 100644
--- a/app/assets/javascripts/apiKey.js
+++ b/app/assets/javascripts/apiKey.js
@@ -50,6 +50,10 @@
             $component.html(states.keyVisible(key, thing))
         );
 
+      if ('stickAtBottomWhenScrolling' in GOVUK) {
+        GOVUK.stickAtBottomWhenScrolling.recalculate();
+      }
+
     };
   };
 

From a11d24e81631d790f47b83990536aedc0124a873 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 1 Feb 2019 15:46:23 +0000
Subject: [PATCH 2/4] Use sticky footer on letter contact details to match
 email reply to

---
 .../service-settings/letter-contact-details.html   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/templates/views/service-settings/letter-contact-details.html b/app/templates/views/service-settings/letter-contact-details.html
index da2c0f0a4..6037e8ec0 100644
--- a/app/templates/views/service-settings/letter-contact-details.html
+++ b/app/templates/views/service-settings/letter-contact-details.html
@@ -15,11 +15,6 @@
         Sender addresses
       </h1>
     </div>
-    {% if current_user.has_permissions('manage_service') %}
-      <div class="column-one-third">
-        <a href="{{ url_for('.service_add_letter_contact', service_id=current_service.id) }}" class="button align-with-heading">Add a new address</a>
-      </div>
-    {% endif %}
   </div>
   <div class="user-list">
     {% if not letter_contact_details %}
@@ -46,4 +41,13 @@
       </div>
     {% endfor %}
   </div>
+  {% if current_user.has_permissions('manage_service') %}
+    <div class="grid-row">
+      <div class="column-whole">
+        <div class="js-stick-at-bottom-when-scrolling">
+          <a href="{{ url_for('.service_add_letter_contact', service_id=current_service.id) }}" class="button">Add a new address</a>
+        </div>
+      </div>
+    </div>
+  {% endif %}
 {% endblock %}

From 1c042567e65ea71d3c9bd1c49e3c71370c90b22f Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 1 Feb 2019 15:46:42 +0000
Subject: [PATCH 3/4] Fix width of textbox on letter contact details page

---
 .../service-settings/letter-contact/add.html  | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/templates/views/service-settings/letter-contact/add.html b/app/templates/views/service-settings/letter-contact/add.html
index 9aac44217..d4be27380 100644
--- a/app/templates/views/service-settings/letter-contact/add.html
+++ b/app/templates/views/service-settings/letter-contact/add.html
@@ -14,26 +14,28 @@
     Add a new address
   </h1>
   <div class="grid-row">
-    {% call form_wrapper() %}
-      {{ textbox(
-          form.letter_contact_block,
-          label='This will appear as the ‘sender’ address on your letters.'|safe,
-          hint='10 lines maximum',
-          width='1-1',
-          rows=10,
-          highlight_tags=True
+    <div class="column-whole">
+      {% call form_wrapper() %}
+        {{ textbox(
+            form.letter_contact_block,
+            label='This will appear as the ‘sender’ address on your letters.'|safe,
+            hint='10 lines maximum',
+            width='1-2',
+            rows=10,
+            highlight_tags=True
+          ) }}
+        {% if not first_contact_block %}
+          <div class="form-group">
+            {{ checkbox(form.is_default) }}
+          </div>
+        {% endif %}
+        {{ page_footer(
+          'Add',
+          back_link=None if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id),
+          back_link_text='Back'
         ) }}
-      {% if not first_contact_block %}
-        <div class="form-group">
-          {{ checkbox(form.is_default) }}
-        </div>
-      {% endif %}
-      {{ page_footer(
-        'Add',
-        back_link=None if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id),
-        back_link_text='Back'
-      ) }}
-    {% endcall %}
+      {% endcall %}
+    </div>
   </div>
 
 {% endblock %}

From f55e2c06ef2a52282fdaf103f016011cd0ebdc71 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 1 Feb 2019 15:58:52 +0000
Subject: [PATCH 4/4] make invite button on org team consistent

---
 .../organisation/users/index.html             | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/templates/views/organisations/organisation/users/index.html b/app/templates/views/organisations/organisation/users/index.html
index f2a4d7b10..0226ade87 100644
--- a/app/templates/views/organisations/organisation/users/index.html
+++ b/app/templates/views/organisations/organisation/users/index.html
@@ -11,16 +11,9 @@
 
 {% block maincolumn_content %}
 
-  <div class="grid-row bottom-gutter">
-    <div class="column-two-thirds">
-      <h1 class="heading-large">
-        Team members
-      </h1>
-    </div>
-    <div class="column-one-third">
-      <a href="{{ url_for('.invite_org_user', org_id=current_org.id) }}" class="button align-with-heading">Invite team member</a>
-    </div>
-  </div>
+  <h1 class="heading-large">
+    Team members
+  </h1>
 
   {% if show_search_box %}
     <div data-module="autofocus">
@@ -58,6 +51,8 @@
     {% endfor %}
   </div>
 
+  <div class="js-stick-at-bottom-when-scrolling">
+    <a href="{{ url_for('.invite_org_user', org_id=current_org.id) }}" class="button">Invite team member</a>
+  </div>
+
 {% endblock %}
-
-