4 files changed, 23 insertions, 36 deletions
diff --git a/web/cobrands/cheshireeast/_colours.scss b/web/cobrands/cheshireeast/_colours.scss
index 363214bd0..2dbc353c9 100644
--- a/web/cobrands/cheshireeast/_colours.scss
+++ b/web/cobrands/cheshireeast/_colours.scss
@@ -27,6 +27,7 @@ $col_button_hover: $green;
 $primary: $white;
 $primary_b: $green;
 $primary_text: $text_black;
+$primary_link_decoration: none;
 
 $base_bg: $white;
 $base_fg: $text_black;
@@ -42,3 +43,8 @@ $header-top-border: false;
 $heading-font: 'Open Sans', sans-serif;
 $body-font: 'Open Sans', sans-serif;
 $meta-font: $body-font;
+
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
+$search-help-margin-desktop: 0;
diff --git a/web/cobrands/cheshireeast/assets.js b/web/cobrands/cheshireeast/assets.js
index bca654af7..f54af471f 100644
--- a/web/cobrands/cheshireeast/assets.js
+++ b/web/cobrands/cheshireeast/assets.js
@@ -20,18 +20,10 @@ var defaults = {
     strategy_class: OpenLayers.Strategy.FixMyStreet
 };
 
-var streetlight_select = $.extend({
-    label: "${feature_id}",
-    labelOutlineColor: "white",
-    labelOutlineWidth: 3,
-    labelYOffset: 65,
-    fontSize: '15px',
-    fontWeight: 'bold'
-}, fixmystreet.assets.style_default_select.defaultStyle);
-
 var streetlight_stylemap = new OpenLayers.StyleMap({
   'default': fixmystreet.assets.style_default,
-  'select': new OpenLayers.Style(streetlight_select)
+  'hover': fixmystreet.assets.style_default_hover,
+  'select': fixmystreet.assets.construct_named_select_style("${feature_id}")
 });
 
 var labeled_defaults = $.extend(true, {}, defaults, {
@@ -39,19 +31,10 @@ var labeled_defaults = $.extend(true, {}, defaults, {
     stylemap: streetlight_stylemap,
     asset_type: 'spot',
     asset_id_field: 'central_as',
+    feature_code: 'feature_id',
     actions: {
-        asset_found: function(asset) {
-          var id = asset.attributes.feature_id || '';
-          if (id !== '') {
-              var asset_name = this.fixmystreet.asset_item;
-              $('.category_meta_message').html('You have selected ' + asset_name + ' <b>' + id + '</b>');
-          } else {
-              $('.category_meta_message').html(this.fixmystreet.asset_item_message);
-          }
-        },
-        asset_not_found: function() {
-           $('.category_meta_message').html(this.fixmystreet.asset_item_message);
-        }
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
     }
 });
 
@@ -60,8 +43,7 @@ fixmystreet.assets.add(labeled_defaults, {
     filter_key: 'feature_gr',
     filter_value: 'LCOL',
     asset_group: 'Street lights',
-    asset_item: 'street light',
-    asset_item_message: 'You can pick a <b class="asset-spot">street light</b> from the map &raquo;'
+    asset_item: 'street light'
 });
 
 fixmystreet.assets.add(defaults, {
diff --git a/web/cobrands/cheshireeast/base.scss b/web/cobrands/cheshireeast/base.scss
index 8e771f0ad..b4174c100 100644
--- a/web/cobrands/cheshireeast/base.scss
+++ b/web/cobrands/cheshireeast/base.scss
@@ -90,15 +90,12 @@ a,
     background-color: #ecf3ec;
 }
 
-#front-main a#geolocate_link {
-    color: #2e3191;
-    background: transparent;
+a#geolocate_link {
     border-bottom: 1px solid #a6a7da;
-    padding: 0;
-    margin-top: 0.5em;
-    font-size: inherit;
+    padding: 0; // remove padding so that border-bottom looks like an underline
+    margin: 0 0 1em 0;
+
     &:hover {
-        background: transparent;
         border-bottom: 1px solid #2e3191;
         transition: border-color 0.5s;
     }
@@ -115,6 +112,10 @@ a,
   }
 }
 
+.search-help__header {
+    line-height: 1.3;
+}
+
 /* Header/footer */
 
 #site-logo {
diff --git a/web/cobrands/cheshireeast/layout.scss b/web/cobrands/cheshireeast/layout.scss
index 71861e13f..ad5c6580b 100644
--- a/web/cobrands/cheshireeast/layout.scss
+++ b/web/cobrands/cheshireeast/layout.scss
@@ -29,11 +29,9 @@ body.frontpage .content {
     margin: 0;
     width: 30em;
 }
-#front-main a#geolocate_link {
-    color: #2e3191;
-    &:hover {
-        text-decoration: none;
-    }
+
+a#geolocate_link {
+    margin-top: 1em;
 }
 
 .ce-footer {