4 files changed, 24 insertions, 48 deletions

diff --git a/web/cobrands/buckinghamshire/_colours.scss b/web/cobrands/buckinghamshire/_colours.scss
index cf328b673..7350e8f33 100644
--- a/web/cobrands/buckinghamshire/_colours.scss
+++ b/web/cobrands/buckinghamshire/_colours.scss
@@ -55,6 +55,10 @@ $col_click_map_dark: darken($bucks_charcoal, 10%);
 $header-top-border-width: 0;
 $header-top-border: 0;
 
+$search-help-alignment: left;
+$search-help-background: #fff3f3;
+$search-help-header-font-size-desktop: 1.25em;
+
 @mixin bucks-button {
   background-color: $bucks_button_bg;
   border: 0;
diff --git a/web/cobrands/buckinghamshire/assets.js b/web/cobrands/buckinghamshire/assets.js
index e11bf1a28..f15c78504 100644
--- a/web/cobrands/buckinghamshire/assets.js
+++ b/web/cobrands/buckinghamshire/assets.js
@@ -40,18 +40,10 @@ fixmystreet.assets.add(defaults, {
     asset_item: 'grit bin'
 });
 
-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 streetlight_code_to_type = {
@@ -68,21 +60,15 @@ var streetlight_code_to_type = {
 
 var labeled_defaults = $.extend(true, {}, defaults, {
     select_action: true,
+    feature_code: 'feature_id',
     stylemap: streetlight_stylemap,
+    construct_asset_name: function(id) {
+        var code = id.replace(/[O0-9]+[A-Z]*/g, '');
+        return {id: id, name: streetlight_code_to_type[code] || 'street light'};
+    },
     actions: {
-        asset_found: function(asset) {
-          var id = asset.attributes.feature_id || '';
-          if (id !== '') {
-              var code = id.replace(/[0-9]/g, '');
-              var asset_name = streetlight_code_to_type[code] || this.fixmystreet.asset_item;
-              $('.category_meta_message').html('You have selected ' + asset_name + ' <b>' + id + '</b>');
-          } else {
-              $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-          }
-        },
-        asset_not_found: function() {
-           $('.category_meta_message').html('You can pick a <b class="asset-spot">' + this.fixmystreet.asset_item + '</b> from the map &raquo;');
-        }
+        asset_found: fixmystreet.assets.named_select_action_found,
+        asset_not_found: fixmystreet.assets.named_select_action_not_found
     }
 });
 
diff --git a/web/cobrands/buckinghamshire/base.scss b/web/cobrands/buckinghamshire/base.scss
index 0c7bb4bc2..aefe76945 100644
--- a/web/cobrands/buckinghamshire/base.scss
+++ b/web/cobrands/buckinghamshire/base.scss
@@ -5,10 +5,6 @@
 
 @import "../sass/base";
 
-.dev-site-notice {
-  display: none;
-}
-
 .container {
   padding: 0 20px;
 }
@@ -106,26 +102,15 @@ dl dt {
   }
 
   #postcodeForm {
-    margin-top: 1em;
+    margin: 1em 0 0 0;
+    padding: 0;
     background: #fff;
+
     div input#sub {
       @include bucks-button();
       box-shadow: 0;
     }
   }
-  a#geolocate_link {
-    background: transparent;
-    color: $bucks_links;
-    padding: 0;
-    font-size: 1em;
-    &:hover,
-    &:active,
-    &:focus { 
-      background: transparent;
-      color: $link-hover-color;
-      text-decoration: underline;
-    }
-  }
 }
 
 .btn-primary, .green-btn, .btn--primary {
@@ -141,7 +126,13 @@ dl dt {
 }
 
 a#geolocate_link {
-  color: $b3;
+  color: $bucks_links;
+
+  &:hover,
+  &:active,
+  &:focus {
+    color: $link-hover-color;
+  }
 }
 
 label {
diff --git a/web/cobrands/buckinghamshire/layout.scss b/web/cobrands/buckinghamshire/layout.scss
index 5df31f9e2..bea2fadc0 100644
--- a/web/cobrands/buckinghamshire/layout.scss
+++ b/web/cobrands/buckinghamshire/layout.scss
@@ -90,19 +90,14 @@ body.twothirdswidthpage .content .sticky-sidebar aside {
     background-color: white;
     text-align: left;
     padding-top: 40px;
+    padding-bottom: 0;
 
     #postcodeForm {
-      margin-top: 0;
-
       div {
         margin: 0;
       }
     }
 
-    a#geolocate_link {
-      color: $b3;
-    }
-
     h1 {
       font-size: 2.5em;
     }