aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/borsetshire/_council-header.scss2
-rw-r--r--web/cobrands/borsetshire/_mysoc-header.scss62
-rw-r--r--web/cobrands/borsetshire/base.scss2
-rw-r--r--web/cobrands/fixmystreet.com/base.scss1
-rw-r--r--web/cobrands/fixmystreet/offline.js10
-rw-r--r--web/cobrands/oxfordshire/base.scss1
-rw-r--r--web/cobrands/sass/_base.scss1
-rw-r--r--web/cobrands/warwickshire/vendor/gamma/print.css4
-rw-r--r--web/cobrands/warwickshire/vendor/gamma/style.css20
-rw-r--r--web/js/map-OpenLayers.js5
10 files changed, 86 insertions, 22 deletions
diff --git a/web/cobrands/borsetshire/_council-header.scss b/web/cobrands/borsetshire/_council-header.scss
index 73d531489..750c11ce0 100644
--- a/web/cobrands/borsetshire/_council-header.scss
+++ b/web/cobrands/borsetshire/_council-header.scss
@@ -1,5 +1,5 @@
.nav-wrapper {
- top: 5em;
+ top: 7.5em;
}
#main-nav {
diff --git a/web/cobrands/borsetshire/_mysoc-header.scss b/web/cobrands/borsetshire/_mysoc-header.scss
new file mode 100644
index 000000000..f1143736c
--- /dev/null
+++ b/web/cobrands/borsetshire/_mysoc-header.scss
@@ -0,0 +1,62 @@
+// Adapted from .ms-header component in FMS Pro WordPress theme.
+
+.ms-header {
+ background-color: #3B3F44;
+ color: #fff;
+}
+
+.ms-header__logo,
+.ms-header__back-to-fms {
+ box-sizing: border-box;
+ margin: 10px 0;
+}
+
+.ms-header__logo {
+ @media (min-width: 48em) {
+ float: right;
+ width: 25%;
+ }
+ padding-left: 1em;
+
+ a {
+ display: block;
+ width: 101px;
+ height: 0;
+ padding-top: 21px;
+ overflow: hidden;
+ background: transparent;
+ background-position: 0 0;
+ background-repeat: no-repeat;
+ background-size: 101px 21px;
+ @include svg-background-image('../fixmystreet.com/images/mysoc-footer/logo-mysociety');
+
+ // Centre on narrow screens, right align on wider screens.
+ margin: 0 auto;
+ @media (min-width: 48em) {
+ margin-right: 0;
+ }
+ }
+}
+
+.ms-header__back-to-fms {
+ @media (min-width: 48em) {
+ width: 75%;
+ float: left;
+ }
+
+ padding-right: 1em;
+
+ display: block; // .ms-header__back-to-fms is an <a> element
+
+ color: #ddd;
+ font-size: 0.875em;
+
+ &:visited {
+ color: #ddd;
+ }
+ &:hover,
+ &:focus {
+ color: #fff;
+ text-decoration: none;
+ }
+}
diff --git a/web/cobrands/borsetshire/base.scss b/web/cobrands/borsetshire/base.scss
index a92d54427..10973fea2 100644
--- a/web/cobrands/borsetshire/base.scss
+++ b/web/cobrands/borsetshire/base.scss
@@ -115,3 +115,5 @@ body.authpage {
.btn--borsetshire {
@include button-reset($text: #000, $hover-text: #000);
}
+
+@import "mysoc-header";
diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss
index 029749ec1..0cc23c539 100644
--- a/web/cobrands/fixmystreet.com/base.scss
+++ b/web/cobrands/fixmystreet.com/base.scss
@@ -9,7 +9,6 @@
@import "../sass/h5bp";
@import "_colours";
@import "../sass/base";
-@import "../sass/top-banner";
// Don't need these styles from core any more,
// as we do funky stuff with the FMS.com logo.
diff --git a/web/cobrands/fixmystreet/offline.js b/web/cobrands/fixmystreet/offline.js
index 18d724e8c..a611cfec0 100644
--- a/web/cobrands/fixmystreet/offline.js
+++ b/web/cobrands/fixmystreet/offline.js
@@ -11,9 +11,9 @@ fixmystreet.offlineBanner = (function() {
function formText() {
var num = fixmystreet.offlineData.getForms().length;
if ( num === 1 ) {
- return num + translation_strings.offline.update_single;
+ return num + ' ' + translation_strings.offline.update_single;
} else {
- return num + translation_strings.offline.update_plural;
+ return num + ' ' + translation_strings.offline.update_plural;
}
}
@@ -338,12 +338,16 @@ fixmystreet.offline = (function() {
});
}
- $('#report_inspect_form').submit(function() {
+ // If we catch the form submit, e.g. Chrome still seems to
+ // try and submit and we get the Chrome offline error page
+ var btn = $('#report_inspect_form input[type=submit]');
+ btn.click(function() {
var data = $(this).serialize() + '&save=1&saved_at=' + Math.floor(+new Date() / 1000);
fixmystreet.offlineData.addForm(this.action, data);
location.href = '/my/planned?saved=1';
return false;
});
+ btn[0].type = 'button';
return true;
}
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 55bd2f436..85fe0fbdf 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -3,7 +3,6 @@
@import "../sass/mixins";
@import "../sass/base";
-@import "../sass/top-banner";
@import "../sass/report_list_pins";
#site-logo {
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 109a67d64..41075907f 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -2389,3 +2389,4 @@ a#geolocate_link.loading, .btn--geolocate.loading {
@import "_multiselect";
@import "_autocomplete";
@import "_dashboard";
+@import "_top-banner";
diff --git a/web/cobrands/warwickshire/vendor/gamma/print.css b/web/cobrands/warwickshire/vendor/gamma/print.css
index ac40d74d3..089386cae 100644
--- a/web/cobrands/warwickshire/vendor/gamma/print.css
+++ b/web/cobrands/warwickshire/vendor/gamma/print.css
@@ -12,7 +12,7 @@
}
/* header image added DJ - 17-02-2016 */
header:before {
- content: url(http://www.warwickshire.gov.uk/wp-content/uploads/2016/02/WCC-Logo.gif);
+ content: url(https://www.warwickshire.gov.uk/wp-content/uploads/2016/02/WCC-Logo.gif);
}
/*header.entry-header {left:none;}*/
@@ -66,7 +66,7 @@ header:before {
}
/*footer {
- content: url(http://www.warwickshire.gov.uk/wp-content/uploads/2016/02/footer-text.jpg);
+ content: url(https://www.warwickshire.gov.uk/wp-content/uploads/2016/02/footer-text.jpg);
}
*/
diff --git a/web/cobrands/warwickshire/vendor/gamma/style.css b/web/cobrands/warwickshire/vendor/gamma/style.css
index a558d761f..d9090a888 100644
--- a/web/cobrands/warwickshire/vendor/gamma/style.css
+++ b/web/cobrands/warwickshire/vendor/gamma/style.css
@@ -8913,7 +8913,7 @@ border-radius:5px;
font-weight:500;
color:white;
text-decoration:none;
- /* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);*/
+ /* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);*/
background-size:25px 20px;
background-repeat:no-repeat;
background-position: 130px 15px;
@@ -8936,7 +8936,7 @@ border-radius:5px;
font-weight:500;
color:white;
text-decoration:none;
- background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
+ background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
background-size:25px 20px;
background-repeat:no-repeat;
background-position: 155px 15px;
@@ -8960,7 +8960,7 @@ border-radius:5px;
/* background: -ms-linear-gradient(left, #0F7C4B 39%,#0F8E50 100%); /* IE10+ */
/* background: linear-gradient(to right, #0F7C4B 39%,#0F8E50 100%); /* W3C */
/* filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0F7C4B', endColorstr='#0F8E50',GradientType=1 );
-/* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);
+/* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow.png);
background-size:25px 20px;
background-position: 130px 15px;*/
/* background-repeat:no-repeat; */
@@ -8969,7 +8969,7 @@ border-radius:5px;
.style-2 ul#super-menu li a:hover {
background: rgb(0, 85, 161);
- /* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);*/
+ /* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);*/
background-repeat: no-repeat;
background-size:25px 20px;
background-position: 155px 15px;
@@ -8982,7 +8982,7 @@ border-radius:5px;
background-color: #F2F5F2;
background: #F2F5F2;
background-image: url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/menu-arrow1.png);
- /* background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png); */
+ /* background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png); */
background-size: 25px 20px;
background-repeat: no-repeat;
background-position: 130px 15px;
@@ -9272,15 +9272,15 @@ border-bottom: solid 1px #FFFFFF;
/*.style-5 ul#super-menu li a:hover, .style-4 ul#super-menu li a:hover {
.style-5 ul#super-menu li a:hover {
-background-image: url(http://www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
+background-image: url(//www.warwickshire.gov.uk/Web/corporate/wccweb.nsf/Links/B6876CFE9798941F80257855005D6E89/$file/menu-arrow2.png);
}*/
.style-4 ul#super-menu li.active a{
-background-image: url(http://www.warwickshire.gov.uk/wp-content/uploads/2014/10/menu-arrow4.png);
+background-image: url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/menu-arrow4.png);
color:#666666;
}
.style-5 ul#super-menu li.active a{
-background-image: url(http://www.warwickshire.gov.uk/wp-content/uploads/2013/06/menu-arrow5.png);
+background-image: url(//www.warwickshire.gov.uk/wp-content/uploads/2013/06/menu-arrow5.png);
color:#666666;
}
@@ -10777,7 +10777,7 @@ h3.home-header {
#home-social {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-socialcare.png);}
#home-events {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-events.png);}
#home-council {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-council.png);}
-#home-audience {background-image:url(http://www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-volunteering.png);}
+#home-audience {background-image:url(//www.warwickshire.gov.uk/wp-content/uploads/2014/10/wd-volunteering.png);}
#home-a-z {background-image:none; margin-left: -1.5em;}
@@ -11543,4 +11543,4 @@ font-family:helvetica!important;
font-size:14px;
}
-} \ No newline at end of file
+}
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 1d417f68e..7f8ec1755 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -240,9 +240,6 @@ $.extend(fixmystreet.utils, {
strategy.deactivate();
var center = bounds.getCenterLonLat();
var z = fixmystreet.map.getZoomForExtent(bounds);
- if ( z < 13 && $('html').hasClass('mobile') ) {
- z = 13;
- }
fixmystreet.map.setCenter(center, z);
// Reactivate the strategy and make it think it's done an update
strategy.activate();
@@ -858,10 +855,10 @@ OpenLayers.Protocol.FixMyStreet = OpenLayers.Class(OpenLayers.Protocol.HTTP, {
$('#loading-indicator').removeClass('hidden');
$('#loading-indicator').attr('aria-hidden', false);
// Pass the values of the category, status, and sort fields as query params
+ options.params = options.params || {};
$.each({ filter_category: 'filter_categories', status: 'statuses', sort: 'sort' }, function(key, id) {
var val = $('#' + id).val();
if (val !== undefined) {
- options.params = options.params || {};
options.params[key] = val;
}
});
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 16:07:27 +0000