aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixmystreet/base.scss10
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js6
-rw-r--r--web/cobrands/fixmystreet/images/spinner-black.gifbin0 -> 1849 bytes
-rw-r--r--web/cobrands/fixmystreet/images/spinner-yellow.gifbin0 -> 1849 bytes
-rw-r--r--web/cobrands/fixmystreet/layout.scss7
-rw-r--r--web/js/map-OpenLayers.js1
6 files changed, 17 insertions, 7 deletions
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 7827e3439..6dbcdc601 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -394,8 +394,8 @@ label{
float:right;
width:28%;
margin-right:0.25em;
- padding-top:0.9em;
- padding-bottom:0.8em;
+ padding-top:0.7em;
+ padding-bottom:0.6em;
}
}
@@ -1112,9 +1112,11 @@ a:hover.button-left {
}
.olControlAttribution {
- bottom: 0.5em !important;
- left: 3px;
+ bottom: 3.25em !important;
+ right: 0.25em !important;
+ left: 0.25em !important;
color: #222222;
+ font-size:0.75em !important;
}
.olControlPermalink {
bottom: 3px !important;
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 6392277f0..68e870201 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -237,7 +237,11 @@ $(function(){
$('#geolocate_link').click(function(e) {
e.preventDefault();
// Spinny thing!
- $(this).append(' <img src="/i/flower.gif" alt="" align="bottom">');
+ if($('.mobile').length){
+ $(this).append(' <img src="/cobrands/fixmystreet/images/spinner-black.gif" alt="" align="bottom">');
+ }else{
+ $(this).append(' <img src="/cobrands/fixmystreet/images/spinner-yellow.gif" alt="" align="bottom">');
+ }
geo_position_js.getCurrentPosition(function(pos) {
$('img', this).remove();
var latitude = pos.coords.latitude;
diff --git a/web/cobrands/fixmystreet/images/spinner-black.gif b/web/cobrands/fixmystreet/images/spinner-black.gif
new file mode 100644
index 000000000..763c98d35
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/spinner-black.gif
Binary files differ
diff --git a/web/cobrands/fixmystreet/images/spinner-yellow.gif b/web/cobrands/fixmystreet/images/spinner-yellow.gif
new file mode 100644
index 000000000..56eed1541
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/spinner-yellow.gif
Binary files differ
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index dbb5f54eb..526567ed6 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -466,10 +466,15 @@ body.twothirdswidthpage {
top:174px !important;
}
+.olControlAttribution {
+ bottom:0.5em !important;
+ left: auto !important;
+}
+
#sub_map_links {
left:auto;
bottom:auto;
- bottom:1em;
+ bottom:2em;
#map_links_toggle {
display:block;
cursor: pointer;
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index f3dda2555..b6859f486 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -279,7 +279,6 @@ $(function(){
$('#side-form').hide();
$('#side').show();
$('#sub_map_links').show();
- heightFix('#report-a-problem-sidebar:visible', '.content', 26);
//only on mobile
$('#mob_sub_map_links').remove();
$('.mobile-map-banner').text('Place pin on map');