Merge branch '866-alerts-ux-simpler'

3 files changed, 35 insertions, 1 deletions

diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 39117be4a..8673b6b76 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -767,7 +767,7 @@ $.extend(fixmystreet.set_up, {
     // (due to not wanting around form to submit, though good thing anyway)
     $('body').on('click', '#alert_rss_button', function(e) {
         e.preventDefault();
-        var feed = $('input[name=feed][type=radio]:checked').nextAll('a').attr('href');
+        var feed = $('input[name=feed][type=radio]:checked').parent().prevAll('a').attr('href');
         window.location.href = feed;
     });
     $('body').on('click', '#alert_email_button', function(e) {
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 679e7da3b..d02efe489 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -2130,6 +2130,8 @@ table.nicetable {
         background: #f6f6f6;
     }
     img[width="16"] {
+        margin-top: 4px;
+        margin-left: 0.5em;
         float: $right;
     }
 }
@@ -2154,6 +2156,29 @@ table.nicetable {
     }
 }
 
+.alerts__cta-box {
+    @extend .form-box;
+    background-color: mix($primary, #fff, 10%);
+    margin-top: 2em;
+    margin-bottom: 2em;
+
+    & > :first-child {
+        margin-top: 0;
+    }
+
+    .form-txt-submit-box {
+        max-width: 32em;
+    }
+}
+
+#rss_local_alt {
+    // Match .label-containing-checkbox
+    padding-left: 24px;
+
+    // Close up space between this and #rss_local
+    margin-top: -1em;
+}
+
 .confirmation-header {
   padding: 140px 0 2em;
   text-align: center;
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index e251a6208..a0c27863e 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -960,6 +960,15 @@ textarea.form-error {
   }
 }
 
+.alerts__columns {
+    @include clearfix;
+    @include flex-container();
+    > div {
+        width: 50%;
+        margin: 0 2em;
+    }
+}
+
 .confirmation-header {
     width: 25em;
     margin: 0 auto 1em;