diff options
| -rw-r--r-- | templates/web/fixmystreet.com/header_extra.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet.com/tracking_code.html | 19 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet.com/layout.scss | 20 | ||||
| -rw-r--r-- | web/cobrands/sass/_dropzone.scss | 6 |
4 files changed, 43 insertions, 6 deletions
diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index f65121445..e05bc31d2 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -9,7 +9,9 @@ var variation = cxApi.chooseVariation(), docElement = document.documentElement, className = docElement.className; -docElement.className = className + ' variant' + variation; +if (!/about\/council/.test(location.pathname)) { + docElement.className = className + ' variant' + variation; +} </script> <style> html .variant1 { display: none !important; } diff --git a/templates/web/fixmystreet.com/tracking_code.html b/templates/web/fixmystreet.com/tracking_code.html index 3b163f516..7213055d0 100644 --- a/templates/web/fixmystreet.com/tracking_code.html +++ b/templates/web/fixmystreet.com/tracking_code.html @@ -29,6 +29,25 @@ ga('ecommerce:send'); ga('send', 'pageview'); </script> + +[% IF created_report %] +<script type="text/javascript"> +var google_conversion_id = 1067468161; +var google_conversion_language = "en"; +var google_conversion_format = "3"; +var google_conversion_color = "ffffff"; +var google_conversion_label = "1nWDCP3t6GQQgYuB_QM"; +var google_remarketing_only = false; +</script> +<script type="text/javascript" src="//www.googleadservices.com/pagead/conversion.js"> +</script> +<noscript> +<div style="display:inline;"> +<img height="1" width="1" style="border-style:none;" alt="" src="//www.googleadservices.com/pagead/conversion/1067468161/?label=1nWDCP3t6GQQgYuB_QM&guid=ON&script=0"/> +</div> +</noscript> +[% END %] + [% ELSE %] <!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" --> [% END %] diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss index 985f16ca8..81c3b3d54 100644 --- a/web/cobrands/fixmystreet.com/layout.scss +++ b/web/cobrands/fixmystreet.com/layout.scss @@ -383,11 +383,13 @@ body.unresponsive-council { background: transparent; } - #main-nav { - text-shadow: 0 1px 5px rgba(0, 0, 0, 0.4); + .nav-menu a, + .nav-menu span { + color: #222; } .nav-menu--main { + font-weight: bold; span { color: inherit; } @@ -403,7 +405,6 @@ body.unresponsive-council { background-color: #fff; color: mix(#fad52a, #000, 50%); padding: 0.25em 0.5em; - text-shadow: none; } } @@ -416,10 +417,19 @@ body.unresponsive-council { background: darken(#fad52a, 5%); } - body.twothirdswidthpage .container .content footer .tablewrapper, + body.twothirdswidthpage .container .content footer .tablewrapper { + color: #222; + background: #fad52a; + } body.fullwidthpage .container .content footer .tablewrapper, #footer-nav .tablewrapper { - background: #fad52a; + color: #222; + background: transparent; + } + + #footer-nav .tablewrapper ul li a, + #footer-nav .tablewrapper ul li span { + color: #222; } .nav-menu--mysoc { diff --git a/web/cobrands/sass/_dropzone.scss b/web/cobrands/sass/_dropzone.scss index 90e53584d..8c482d0cf 100644 --- a/web/cobrands/sass/_dropzone.scss +++ b/web/cobrands/sass/_dropzone.scss @@ -120,6 +120,11 @@ $dropzone-background-color--full: mix($dropzone-border-color--full, $dropzone-ba } } +// If there was an error, we don't want to display the preview image on top of it. +.dz-error .dz-image { + display: none; +} + .dz-progress { position: absolute; top: 0; @@ -148,6 +153,7 @@ $dropzone-background-color--full: mix($dropzone-border-color--full, $dropzone-ba .dz-error-message { color: #881111; + padding-top: 1.5em; } .dz-remove, |