Merge branch '972-completion-adverts'

14 files changed, 117 insertions, 63 deletions

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 57eadc435..ff4f4df91 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -32,70 +32,59 @@
   background: url($image-sprite) -3px -3px no-repeat;
 }
 
-.confirmation-header {
-  padding: 2em 1em;
+.next-steps {
+  margin: 0 -1em; // counteract padding on parent
+  background-color: #faf7e2;
+}
 
-  @media only screen and (min-width: 48em) {
-    padding: 3em 0;
-    text-align: center;
+.next-steps__step {
+  box-sizing: border-box;
+  padding: 1em;
+
+  & + .next-steps__step {
+    border-top: 1px solid #ede8c9;
   }
 
-  h1 {
+  h2 {
     margin-top: 0;
   }
 
   p {
-    font-size: 1.3em;
-    line-height: 1.4em;
+    color: #666666;
     margin-bottom: 0;
   }
-
-  p + p {
-    margin-top: 0.5em;
-  }
 }
 
-.advert-mobile-apps {
-  margin: 0 -1em; // counteract padding on parent
-  background-color: #fff9cc;
-  padding: 2em;
-
-  @media only screen and (min-width: 48em) {
-    padding-left: 37%;
-    background: #fff9cc url(/cobrands/fixmystreet/images/advert-app-watercolour.jpg) 7% 50% no-repeat;
-  }
+.next-steps__step__cta {
+  @include pie-clearfix;
+  padding-top: 0.4em; // extra padding between buttons and previous paragraph
 
-  h1 {
-    margin-top: 0;
-  }
+  a {
+    float: left;
+    margin: 1em 0.6em 0 0;
 
-  p {
-    font-size: 1.3em;
-    line-height: 1.4em;
+    &:last-child {
+      margin-right: 0;
+    }
   }
 
-  .app-links {
-    @include clearfix;
-    margin-bottom: 1em;
+  .next-steps__step--goodies {
+    min-height: 37px; // stop absolutely positioned img overlapping bottom of parent element
 
-    a {
-      float: left;
-      margin-right: 1em;
-    }
-
-    a[href*="itunes.apple.com"] {
-      margin-top: 3px; // compensate for slightly smaller itunes button
+    img {
+      // absolute positioning to overlap floated goodies image to the right
+      position: absolute;
+      max-width: none;
     }
   }
+}
 
-  .desktop-advice {
-    clear: left;
-    font-size: 1em;
-    line-height: 1.2em;
-    color: #745D17; // brown
+.next-steps__step--goodies {
+  @include pie-clearfix;
 
-    @media only screen and (min-width: 48em) {
-      width: 28em; // break line at a nice point
-    }
+  .goodies-preview {
+    float: right;
+    margin-left: 1em;
+    margin-right: -0.5em;
   }
 }
diff --git a/web/cobrands/fixmystreet/images/advert-app-watercolour.jpg b/web/cobrands/fixmystreet/images/advert-app-watercolour.jpg
deleted file mode 100644
index 9c372fed5..000000000
--- a/web/cobrands/fixmystreet/images/advert-app-watercolour.jpg
+++ /dev/null
diff --git a/web/cobrands/fixmystreet/images/next-step-apple.png b/web/cobrands/fixmystreet/images/next-step-apple.png
new file mode 100644
index 000000000..79476f552
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/next-step-apple.png
diff --git a/web/cobrands/fixmystreet/images/next-step-download.png b/web/cobrands/fixmystreet/images/next-step-download.png
new file mode 100644
index 000000000..525c27d1f
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/next-step-download.png
diff --git a/web/cobrands/fixmystreet/images/next-step-facebook.png b/web/cobrands/fixmystreet/images/next-step-facebook.png
new file mode 100644
index 000000000..c01fa6ced
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/next-step-facebook.png
diff --git a/web/cobrands/fixmystreet/images/next-step-goodies.png b/web/cobrands/fixmystreet/images/next-step-goodies.png
new file mode 100644
index 000000000..27fe702c3
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/next-step-goodies.png
diff --git a/web/cobrands/fixmystreet/images/next-step-google.png b/web/cobrands/fixmystreet/images/next-step-google.png
new file mode 100644
index 000000000..6b2244c44
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/next-step-google.png
diff --git a/web/cobrands/fixmystreet/images/next-step-twitter.png b/web/cobrands/fixmystreet/images/next-step-twitter.png
new file mode 100644
index 000000000..e79255bd6
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/next-step-twitter.png
diff --git a/web/cobrands/fixmystreet/images/sad-face-in-circle-100px.png b/web/cobrands/fixmystreet/images/sad-face-in-circle-100px.png
new file mode 100644
index 000000000..093c3ea06
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/sad-face-in-circle-100px.png
diff --git a/web/cobrands/fixmystreet/images/tick-in-circle-100px.png b/web/cobrands/fixmystreet/images/tick-in-circle-100px.png
new file mode 100644
index 000000000..54647a012
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/tick-in-circle-100px.png
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index ded1ed911..20ea2f11a 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -256,3 +256,30 @@ body.alertindex {
     display: none;
   }
 }
+
+.next-steps {
+  @include clearfix;
+  margin-bottom: 2em; // add some space between this and the footer
+}
+
+.next-steps__step {
+  font-family: MuseoSans,Helmet,Freesans,sans-serif;
+  float: left;
+  width: 33%;
+  padding: 1.8em;
+
+  & + .next-steps__step {
+    border-top: none;
+    border-left: 1px solid #ede8c9;
+  }
+
+  h2 {
+    font-family: inherit;
+    font-weight: bold;
+    line-height: 1.2em;
+  }
+
+  p {
+    line-height: 1.4em;
+  }
+}
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 5bc1105cf..8e2a65d1b 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -64,13 +64,13 @@ h3 {
 h4 {
   font-size: 1em;
   font-weight: normal;
-  margin-bottom: 1em; 
+  margin-bottom: 1em;
 }
 
 // default list styles
 ul, ol {
   font-size: 1em;
-  margin-bottom: 2em;  
+  margin-bottom: 2em;
   margin-left: 2em;
   padding:0;
 }
@@ -171,7 +171,7 @@ a:visited {
   &:hover,
   &:active {
     text-decoration:underline;
-    color:#0D7CCE;    
+    color:#0D7CCE;
   }
 }
 
@@ -711,7 +711,7 @@ a.button-left {
   font-size: 1em;
   line-height: 1;
   margin:0;
-  border:1px solid #999;  
+  border:1px solid #999;
   color:#333;
   background: #eee;
   @include border-radius(4px);
@@ -719,7 +719,7 @@ a.button-left {
     color:#fff;
     background:#777;
     text-decoration: none;
-    border:1px solid #666;  
+    border:1px solid #666;
   }
 }
 .button-right,
@@ -1577,4 +1577,47 @@ table.nicetable {
     }
 }
 
+.confirmation-header {
+  padding: 140px 0 2em;
+  text-align: center;
+
+  background: transparent url(/cobrands/fixmystreet/images/tick-in-circle-100px.png) center 1em no-repeat;
+  &.confirmation-header--failure {
+    background-image: url(/cobrands/fixmystreet/images/sad-face-in-circle-100px.png);
+  }
+
+  h1, h2 {
+    margin: 0;
+    line-height: 1.2em;
+  }
+
+  h1 {
+    a {
+      text-decoration: underline;
+      color: inherit;
+
+      &:hover,
+      &:focus {
+        text-decoration: none;
+        color: #0BA7D1; // default link colour
+      }
+    }
+  }
+
+  h1 + h2,
+  h1 ~ p {
+    margin-top: 12px;
+  }
+
+  p {
+    color: #666666;
+    font-size: 1.2em;
+    margin-bottom: 0.5em;
+  }
+
+  & > :last-child {
+    margin-bottom: 0;
+  }
+}
+
 @import "_admin";
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index d1cfb6be7..162bf30e1 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -1080,6 +1080,14 @@ body.frontpage {
   }
 }
 
+.confirmation-header {
+    width: 25em;
+    margin: 0 auto 1em;
+    text-align: left;
+    padding: 3em 0 3em 132px; // for tick icon
+    background-position: 0 2em;
+}
+
 /* Admin interface */
 
 .fms-admin-floated {
diff --git a/web/css/core.scss b/web/css/core.scss
index ed47cb01a..897b2d095 100644
--- a/web/css/core.scss
+++ b/web/css/core.scss
@@ -65,19 +65,6 @@ $map_width: 500px;
         clear: both;
     }
 
-    // Site-wide layout
-
-    #advert_thin {
-        width: 50%;
-        margin: 1em auto;
-        text-align: center;
-        border-top: dotted 1px #999999;
-    }
-    #advert_hfymp {
-        border-top: dotted 1px #999999;
-        text-align: center;
-    }
-
     // Front page
 
     p#expl {