39 files changed, 28 insertions, 10 deletions

diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 41a408a96..3d1c020f2 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -63,6 +63,9 @@ select, input, textarea {
     max-width: 95%;
 }
 
+img {
+    max-width: 100%;
+}
 
 /* LINKS */
 
@@ -107,9 +110,8 @@ a:active, a:hover {
 }
 
 #meta {
-    float: right;
     list-style-type: none;
-    margin: -3em 0 0 1em;
+    margin: 0.5em 0;
     padding: 0;
     font-size: 0.875em;
     li {
@@ -141,7 +143,7 @@ a:active, a:hover {
 
 #wrapper2 {
     max-width: 59em;
-    padding: 0 0.5em;
+    padding: 0.5em;
     margin: 0 auto;
 }
 
diff --git a/web/cobrands/fixmystreet/fms-logo-flat.png b/web/cobrands/fixmystreet/fms-logo-flat.png
new file mode 100644
index 000000000..50d1e4891
--- /dev/null
+++ b/web/cobrands/fixmystreet/fms-logo-flat.png
diff --git a/web/cobrands/fixmystreet/fms-logo.png b/web/cobrands/fixmystreet/fms-logo.png
new file mode 100644
index 000000000..23bea6b0f
--- /dev/null
+++ b/web/cobrands/fixmystreet/fms-logo.png
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index 994a8a336..6793414d0 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -12,6 +12,10 @@ body {
     background-image:         linear-gradient(top, $colour_dark, $colour 6px);
 }
 
+#wrapper2 {
+    padding: 0 0.5em;
+}
+
 /* A third wrapper is needed because display:table cannot be given a max-width.
  * The other two wrappers (to set full width white background and the
  * max-width, are defined in base.scss. */
@@ -30,6 +34,11 @@ body {
     }
 }
 
+#meta {
+    float: right;
+    margin: -3em 0 0 1em;
+}
+
 #mysociety {
     padding: 0 0 1em 0;
 }
@@ -134,7 +143,7 @@ body {
         position: absolute;
         top: 7px;
         right: 0;
-        width: 38em;
+        width: 47em;
     }
 
     #navigation .spacer {
diff --git a/web/i/pin-shadow.png b/web/i/pin-shadow.png
new file mode 100644
index 000000000..1b6d2380f
--- /dev/null
+++ b/web/i/pin-shadow.png
diff --git a/web/i/pin3orange.gif b/web/i/pin3orange.gif
deleted file mode 100644
index 4a45bd89c..000000000
--- a/web/i/pin3orange.gif
+++ /dev/null
diff --git a/web/i/pin3pink.gif b/web/i/pin3pink.gif
deleted file mode 100644
index 93401b264..000000000
--- a/web/i/pin3pink.gif
+++ /dev/null
diff --git a/web/i/pinB.gif b/web/i/pinB.gif
deleted file mode 100644
index 2501bc63b..000000000
--- a/web/i/pinB.gif
+++ /dev/null
diff --git a/web/i/pinB.png b/web/i/pinB.png
new file mode 100644
index 000000000..0d549dc8c
--- /dev/null
+++ b/web/i/pinB.png
diff --git a/web/i/pinG.gif b/web/i/pinG.gif
deleted file mode 100644
index 6ba710878..000000000
--- a/web/i/pinG.gif
+++ /dev/null
diff --git a/web/i/pinG.png b/web/i/pinG.png
new file mode 100644
index 000000000..dc1c3ba05
--- /dev/null
+++ b/web/i/pinG.png
diff --git a/web/i/pinG1.gif b/web/i/pinG1.gif
deleted file mode 100644
index 58f136791..000000000
--- a/web/i/pinG1.gif
+++ /dev/null
diff --git a/web/i/pinG2.gif b/web/i/pinG2.gif
deleted file mode 100644
index bcd7beddf..000000000
--- a/web/i/pinG2.gif
+++ /dev/null
diff --git a/web/i/pinG3.gif b/web/i/pinG3.gif
deleted file mode 100644
index 140ad9a7d..000000000
--- a/web/i/pinG3.gif
+++ /dev/null
diff --git a/web/i/pinG4.gif b/web/i/pinG4.gif
deleted file mode 100644
index 3da172f24..000000000
--- a/web/i/pinG4.gif
+++ /dev/null
diff --git a/web/i/pinG5.gif b/web/i/pinG5.gif
deleted file mode 100644
index 22fb7b919..000000000
--- a/web/i/pinG5.gif
+++ /dev/null
diff --git a/web/i/pinG6.gif b/web/i/pinG6.gif
deleted file mode 100644
index d06d37f7a..000000000
--- a/web/i/pinG6.gif
+++ /dev/null
diff --git a/web/i/pinG7.gif b/web/i/pinG7.gif
deleted file mode 100644
index a9c194a85..000000000
--- a/web/i/pinG7.gif
+++ /dev/null
diff --git a/web/i/pinG8.gif b/web/i/pinG8.gif
deleted file mode 100644
index 68978cb2d..000000000
--- a/web/i/pinG8.gif
+++ /dev/null
diff --git a/web/i/pinG9.gif b/web/i/pinG9.gif
deleted file mode 100644
index 2ed1adffe..000000000
--- a/web/i/pinG9.gif
+++ /dev/null
diff --git a/web/i/pinP.gif b/web/i/pinP.gif
deleted file mode 100644
index 70ee2a6cb..000000000
--- a/web/i/pinP.gif
+++ /dev/null
diff --git a/web/i/pinP.png b/web/i/pinP.png
new file mode 100644
index 000000000..4e835234c
--- /dev/null
+++ b/web/i/pinP.png
diff --git a/web/i/pinR.gif b/web/i/pinR.gif
deleted file mode 100644
index 612c6f72e..000000000
--- a/web/i/pinR.gif
+++ /dev/null
diff --git a/web/i/pinR.png b/web/i/pinR.png
new file mode 100644
index 000000000..c16299fd2
--- /dev/null
+++ b/web/i/pinR.png
diff --git a/web/i/pinR1.gif b/web/i/pinR1.gif
deleted file mode 100644
index ecba968c2..000000000
--- a/web/i/pinR1.gif
+++ /dev/null
diff --git a/web/i/pinR2.gif b/web/i/pinR2.gif
deleted file mode 100644
index fa1b11cbf..000000000
--- a/web/i/pinR2.gif
+++ /dev/null
diff --git a/web/i/pinR3.gif b/web/i/pinR3.gif
deleted file mode 100644
index 31c27dc02..000000000
--- a/web/i/pinR3.gif
+++ /dev/null
diff --git a/web/i/pinR4.gif b/web/i/pinR4.gif
deleted file mode 100644
index 183135eb4..000000000
--- a/web/i/pinR4.gif
+++ /dev/null
diff --git a/web/i/pinR5.gif b/web/i/pinR5.gif
deleted file mode 100644
index d16c826c5..000000000
--- a/web/i/pinR5.gif
+++ /dev/null
diff --git a/web/i/pinR6.gif b/web/i/pinR6.gif
deleted file mode 100644
index ea6092e98..000000000
--- a/web/i/pinR6.gif
+++ /dev/null
diff --git a/web/i/pinR7.gif b/web/i/pinR7.gif
deleted file mode 100644
index e9f1fddeb..000000000
--- a/web/i/pinR7.gif
+++ /dev/null
diff --git a/web/i/pinR8.gif b/web/i/pinR8.gif
deleted file mode 100644
index b792510ee..000000000
--- a/web/i/pinR8.gif
+++ /dev/null
diff --git a/web/i/pinR9.gif b/web/i/pinR9.gif
deleted file mode 100644
index b651cc0be..000000000
--- a/web/i/pinR9.gif
+++ /dev/null
diff --git a/web/i/pin_red.gif b/web/i/pin_red.gif
deleted file mode 100644
index 70a8c469c..000000000
--- a/web/i/pin_red.gif
+++ /dev/null
diff --git a/web/i/pin_red.png b/web/i/pin_red.png
deleted file mode 100644
index f960799b3..000000000
--- a/web/i/pin_red.png
+++ /dev/null
diff --git a/web/i/pin_shadow.png b/web/i/pin_shadow.png
deleted file mode 100644
index 3a89759fc..000000000
--- a/web/i/pin_shadow.png
+++ /dev/null
diff --git a/web/i/pin_yellow.gif b/web/i/pin_yellow.gif
deleted file mode 100644
index 829c7afda..000000000
--- a/web/i/pin_yellow.gif
+++ /dev/null
diff --git a/web/i/pin_yellow.png b/web/i/pin_yellow.png
deleted file mode 100644
index 26e8a9d13..000000000
--- a/web/i/pin_yellow.png
+++ /dev/null
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 2a67eb811..1ddad2fbb 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -35,7 +35,7 @@ function fms_markers_list(pins, transform) {
         var marker = new OpenLayers.Feature.Vector(loc, {
             type: cols[pin[2]],
             id: pin[3],
-            title: pin[4]
+            title: pin[4] || ''
         });
         markers.push( marker );
     }
@@ -61,13 +61,20 @@ function fixmystreet_onload() {
     var pin_layer_options = {
         styleMap: new OpenLayers.StyleMap({
             'default': new OpenLayers.Style({
-                externalGraphic: "/i/pin${type}.gif",
+                externalGraphic: "/i/pin${type}.png",
                 graphicTitle: "${title}",
-                graphicWidth: 32,
-                graphicHeight: 59,
+                graphicWidth: 44,
+                graphicHeight: 58,
                 graphicOpacity: 1,
-                graphicXOffset: -2,
-                graphicYOffset: -59
+                graphicXOffset: -22,
+                graphicYOffset: -58,
+                backgroundGraphic: "/i/pin-shadow.png",
+                backgroundWidth: 50,
+                backgroundHeight: 19,
+                backgroundXOffset: -7,
+                backgroundYOffset: -19
+                //graphicZIndex: 11,
+                //backgroundGraphicZIndex: 10,
             })
         })
     };