aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/bromley/base.scss6
-rw-r--r--web/cobrands/fixmystreet.com/layout.scss2
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js5
-rw-r--r--web/cobrands/oxfordshire/base.scss14
-rw-r--r--web/cobrands/oxfordshire/layout.scss12
-rw-r--r--web/cobrands/sass/_base.scss50
-rw-r--r--web/cobrands/sass/_layout.scss20
-rw-r--r--web/cobrands/warwickshire/base.scss16
-rw-r--r--web/cobrands/warwickshire/layout.scss13
-rw-r--r--web/cobrands/westminster/base.scss17
-rw-r--r--web/cobrands/westminster/layout.scss15
-rw-r--r--web/js/map-OpenStreetMap.js6
-rw-r--r--web/js/map-bing-ol.js7
-rw-r--r--web/js/map-google-ol.js7
-rw-r--r--web/js/map-streetview.js2
-rw-r--r--web/js/map-toner-lite.js6
-rw-r--r--web/js/map-wmts-bristol.js7
-rw-r--r--web/js/map-wmts-buckinghamshire.js7
-rw-r--r--web/js/map-wmts-hounslow.js7
19 files changed, 44 insertions, 175 deletions
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index b2492d928..0f316b955 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -243,6 +243,12 @@ input.field, input.text,
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
+
+ #postcodeForm & {
+ margin: 0;
+ height: auto;
+ line-height: 1;
+ }
}
// Bromley's silly A-Z menu
diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss
index 5ab22c081..f6d7c9096 100644
--- a/web/cobrands/fixmystreet.com/layout.scss
+++ b/web/cobrands/fixmystreet.com/layout.scss
@@ -140,7 +140,6 @@ body.fullwidthpage {
color: #777;
font-size: 0.9em;
height: 2.6em;
- width: 20em;
&:focus {
outline: 0;
}
@@ -148,7 +147,6 @@ body.fullwidthpage {
input#sub {
font-size: 1.1em;
height: 2.4em;
- width: 3.5em;
font-family: $body-font;
font-weight: bold;
}
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 8bcb71a3a..24b8a6d0f 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -809,19 +809,14 @@ $.extend(fixmystreet.set_up, {
},
map_controls: function() {
- //add permalink on desktop, force hide on mobile
//add links container (if its not there)
if (fixmystreet.cobrand != 'zurich') {
if ($('#sub_map_links').length === 0) {
$('<p class="sub-map-links" id="sub_map_links" />').insertAfter($('#map'));
}
- if ($('#map_permalink').length === 0) {
- $('#sub_map_links').append('<a href="#" id="map_permalink">' + translation_strings.permalink + '</a>');
- }
}
if ($('.mobile').length) {
- $('#map_permalink').addClass('hidden');
// Make sure we end up with one Get updates link
if ($('#key-tools a.js-feed').length) {
$('#sub_map_links a.js-feed').remove();
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 989c3b19c..999321a7e 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -88,28 +88,14 @@ a:not([class]):focus {
}
div {
- display: block;
- width: auto;
- background: transparent;
border: none;
font-size: 1.25em;
margin-top: 0.5em;
max-width: 24em;
- @include flex-container();
-
input#pc {
- display: block;
margin: 0 0.5em 0 0;
- padding: 0.5em;
- }
-
- input#sub {
- padding-top: 0.6em;
- padding-bottom: 0.5em;
- width: auto;
- height: auto;
}
}
}
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index 52b5544ef..1b415903a 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -117,28 +117,16 @@ $mappage-header-height: 10em;
overflow: visible;
div {
- display: block;
width: auto;
max-width: 38em;
margin: 0.75em 0 0 0;
- overflow: visible;
-
- @include flex-container();
input#pc {
- display: block;
- margin: 0 0.5em 0 0;
- padding: 0.5em;
- height: auto;
- width: 100%;
max-width: 80%;
}
input#sub {
padding: 0.6em 1.5em;
- width: auto;
- height: auto;
- text-transform: none;
}
}
}
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 2d67b3986..4cdb483ae 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -13,7 +13,7 @@ $link-hover-text-decoration: underline !default;
$itemlist_item_background: #f6f6f6 !default;
$itemlist_item_background_hover: #e6e6e6 !default;
-$col_big_numbers: #ccc !default;
+$col_big_numbers: #666 !default;
$col_fixed_label: #00BD08 !default;
$col_fixed_label_light: mix($col_fixed_label, #fff, 10%) !default;
@@ -442,7 +442,7 @@ small#or:after {
margin: 0 0 0.5em;
}
- h5 {
+ h3 {
margin: 0 0 1em;
font-size: 1.125em;
font-weight: normal;
@@ -489,20 +489,22 @@ small#or:after {
.form-txt-submit-box {
@include clearfix();
+ @include flex-container();
+ @include flex-wrap(wrap);
input[type=password],
input[type=tel],
input[type=number],
input[type=text],
input[type=email] {
- width: 65%;
- float: $left;
+ width: auto;
+ max-width: none;
+ @include flex(72 0 auto);
}
input[type=submit] {
- float: $right;
- width:28%;
- margin-#{$right}: 0.25em;
- padding-top:0.6em;
- padding-bottom:0.5em;
+ @include flex(28 0 auto);
+ margin: 0 0.25em 0.5em;
+ padding-top: 0.6em;
+ padding-bottom: 0.5em;
}
}
@@ -1761,11 +1763,6 @@ html.js #map .noscript {
background-position: -24px 0;
}
- #map_permalink:after {
- @extend %sub-map-link-icon;
- background-position: -48px 0;
- }
-
#fms_shortlist_all:after {
@extend %sub-map-link-icon;
background-position: -60px 0;
@@ -1903,10 +1900,6 @@ html.js #map .noscript {
.olControlAttribution img {
vertical-align: bottom;
}
-.olControlPermalink {
- bottom: 3px !important;
- #{$right}: 3px;
-}
.olControlDragFeatureFMSOver {
cursor: move;
cursor: -webkit-grab;
@@ -2276,31 +2269,26 @@ label .muted {
margin-bottom: 0.5em;
}
div {
- display:table;
- width:100%;
+ @include flex-container;
+ @include flex-wrap(wrap);
+ width: 100%;
background:#fff;
border:1px solid $primary_b;
input#pc {
- display:table-cell;
- margin:0;
- padding:0.25em 2%;
- width:86%;
+ @include flex(86 0 auto);
+ width: 50%;
border:none;
background:none;
line-height:1.5em;
}
input#sub {
- display:table-cell;
border:none;
- padding:0;
- margin:0;
- width:14%;
- height:35px;
+ padding: 0.5em;
+ @include flex(14 0 auto);
background:#000;
color:#fff;
- text-transform:uppercase;
@include border-radius(0);
- &:hover {
+ &:hover, &:focus {
background:#333;
}
}
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index b27305d31..aafb6656a 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -11,6 +11,8 @@ $mappage-actions-width--medium: 20em;
$header-top-border-width: 0.25em !default;
$header-top-border: $header-top-border-width solid $primary !default;
+$container-max-width: 60em !default;
+
.internal-link-fixed-header {
display: block;
position: relative;
@@ -824,7 +826,7 @@ textarea.form-error {
margin: 0;
padding: 1em;
#front-main-container {
- max-width: 60em;
+ max-width: $container-max-width;
margin: 0 auto;
}
h2 {
@@ -845,24 +847,8 @@ textarea.form-error {
margin-top: -0.25em;
}
div {
- display:block;
margin:0 auto;
width:20em;
- overflow:hidden;
- input#pc {
- display:block;
- float: $left;
- padding:0.25em 0.5em;
- height:2em;
- width:17em;
- }
- input#sub {
- display:block;
- float: $right;
- width:3em;
- height:2.3em;
- padding-top:0.2em;
- }
}
}
a {
diff --git a/web/cobrands/warwickshire/base.scss b/web/cobrands/warwickshire/base.scss
index d3560e0a4..224346195 100644
--- a/web/cobrands/warwickshire/base.scss
+++ b/web/cobrands/warwickshire/base.scss
@@ -32,23 +32,14 @@
background: transparent;
div {
- display: block;
- width: auto;
background: #fff;
border: none;
margin-top: 0.5em;
max-width: 24em;
-
- @include flex-container();
- @include flex-align(stretch);
-
box-shadow: 0 0.1em 0.2em rgba(0, 0, 0, 0.2);
input#pc {
- display: block;
- margin: 0;
- padding: 0.5em;
font-family: inherit;
color: $primary_text;
@@ -73,7 +64,8 @@
// or wrap the text content in an element we can hide?
text-indent: -9000px;
- &:hover {
+ &:hover,
+ &:focus {
background-color: $primary;
@include svg-background-image('/cobrands/warwickshire/images/search');
background-repeat: no-repeat;
@@ -81,10 +73,8 @@
background-size: 20px 20px;
}
- // TODO: Because of our text-indent, this draws a
- // gigantic yellow box off the screen!!!
&:focus {
- outline: 3px solid $warwickshire-yellow;
+ background-color: $warwickshire-yellow;
}
}
}
diff --git a/web/cobrands/warwickshire/layout.scss b/web/cobrands/warwickshire/layout.scss
index cf98ba32a..ac360f16d 100644
--- a/web/cobrands/warwickshire/layout.scss
+++ b/web/cobrands/warwickshire/layout.scss
@@ -33,22 +33,9 @@
max-width: 38em;
margin-left: 0;
margin-right: 0;
- overflow: visible;
-
- @include flex-container();
input#pc {
- width: 100%;
- height: auto;
- margin: 0;
max-width: none;
- padding: 0.5em;
- }
-
- input#sub {
- width: 40px;
- height: auto;
- padding-top: 0;
}
}
diff --git a/web/cobrands/westminster/base.scss b/web/cobrands/westminster/base.scss
index 06504be32..c67a67f6d 100644
--- a/web/cobrands/westminster/base.scss
+++ b/web/cobrands/westminster/base.scss
@@ -50,34 +50,27 @@ body.frontpage {
color: inherit;
div {
- display: block;
border: none;
background: transparent;
position: relative;
+ background: #fff;
+ box-shadow: 1px 1px 5px 1px rgba(104, 104, 104, 0.4);
input#pc {
- display: block;
- width: 100%;
box-sizing: border-box;
padding: 10px 22px;
- box-shadow: 1px 1px 5px 1px rgba(104, 104, 104, 0.4);
- background: #fff;
}
input#sub {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- display: block;
width: 0;
- height: auto;
padding-left: 50px;
overflow: hidden;
+ @include flex(0 0 auto);
background: transparent url(/cobrands/westminster/images/search-icon.png) no-repeat 50% 50%;
background-size: 25px 25px;
- &:hover {
+ &:hover,
+ &:focus {
background: transparent url(/cobrands/westminster/images/search-icon.png) no-repeat 50% 50%;
background-size: 25px 25px;
}
diff --git a/web/cobrands/westminster/layout.scss b/web/cobrands/westminster/layout.scss
index 7864f37ac..94483a523 100644
--- a/web/cobrands/westminster/layout.scss
+++ b/web/cobrands/westminster/layout.scss
@@ -28,21 +28,6 @@
div {
margin: 0;
- overflow: visible;
-
- input#pc {
- float: none;
- height: auto;
- width: 100%;
- padding: 10px 22px;
- }
-
- input#sub {
- float: none;
- height: auto;
- width: 0;
- padding-top: 0;
- }
}
}
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 52eb95493..9ed3a2ee3 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -1,14 +1,10 @@
fixmystreet.maps.config = function() {
- var permalink_id;
- if ($('#map_permalink').length) {
- permalink_id = 'map_permalink';
- }
fixmystreet.controls = [
new OpenLayers.Control.ArgParserFMS(),
new OpenLayers.Control.Attribution(),
//new OpenLayers.Control.LayerSwitcher(),
new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.PermalinkFMS(permalink_id),
+ new OpenLayers.Control.PermalinkFMS('map'),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
};
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index 6c9ab8a62..4e01ff58b 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -1,14 +1,9 @@
fixmystreet.maps.config = function() {
- var permalink_id;
- if ($('#map_permalink').length) {
- permalink_id = 'map_permalink';
- }
-
fixmystreet.controls = [
new OpenLayers.Control.Attribution(),
new OpenLayers.Control.ArgParserFMS(),
new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.PermalinkFMS(permalink_id),
+ new OpenLayers.Control.PermalinkFMS('map'),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
/* Linking back to around from report page, keeping track of map moves */
diff --git a/web/js/map-google-ol.js b/web/js/map-google-ol.js
index 4b2d818c9..2769853ce 100644
--- a/web/js/map-google-ol.js
+++ b/web/js/map-google-ol.js
@@ -17,15 +17,10 @@ $(function(){
});
fixmystreet.maps.config = function() {
- var permalink_id;
- if ($('#map_permalink').length) {
- permalink_id = 'map_permalink';
- }
-
fixmystreet.controls = [
new OpenLayers.Control.ArgParserFMS(),
new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.PermalinkFMS(permalink_id),
+ new OpenLayers.Control.PermalinkFMS('map'),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js
index 4701a7f20..f36b7eaea 100644
--- a/web/js/map-streetview.js
+++ b/web/js/map-streetview.js
@@ -2,7 +2,7 @@ fixmystreet.maps.config = function() {
fixmystreet.controls = [
new OpenLayers.Control.ArgParserFMS(),
new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.Permalink(),
+ new OpenLayers.Control.PermalinkFMS('map'),
new OpenLayers.Control.PanZoomFMS()
];
fixmystreet.map_type = OpenLayers.Layer.StreetView;
diff --git a/web/js/map-toner-lite.js b/web/js/map-toner-lite.js
index 0700dbb55..6e44437a0 100644
--- a/web/js/map-toner-lite.js
+++ b/web/js/map-toner-lite.js
@@ -1,12 +1,8 @@
fixmystreet.maps.config = function() {
- var permalink_id;
- if ($('#map_permalink').length) {
- permalink_id = 'map_permalink';
- }
fixmystreet.controls = [
new OpenLayers.Control.ArgParserFMS(),
new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.PermalinkFMS(permalink_id),
+ new OpenLayers.Control.PermalinkFMS('map'),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
fixmystreet.layer_options = [ {
diff --git a/web/js/map-wmts-bristol.js b/web/js/map-wmts-bristol.js
index 88db20c52..757f347df 100644
--- a/web/js/map-wmts-bristol.js
+++ b/web/js/map-wmts-bristol.js
@@ -98,15 +98,10 @@ fixmystreet.maps.matrix_ids = [
* to setup the way the map should operate.
*/
fixmystreet.maps.config = function() {
- var permalink_id;
- if ($('#map_permalink').length) {
- permalink_id = 'map_permalink';
- }
-
fixmystreet.controls = [
new OpenLayers.Control.ArgParserFMS(),
new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.PermalinkFMS(permalink_id)
+ new OpenLayers.Control.PermalinkFMS('map')
];
if ( fixmystreet.page != 'report' || !$('html').hasClass('mobile') ) {
fixmystreet.controls.push( new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) );
diff --git a/web/js/map-wmts-buckinghamshire.js b/web/js/map-wmts-buckinghamshire.js
index bb76a800b..ee5ac8753 100644
--- a/web/js/map-wmts-buckinghamshire.js
+++ b/web/js/map-wmts-buckinghamshire.js
@@ -115,15 +115,10 @@ fixmystreet.maps.matrix_ids = [
* to setup the way the map should operate.
*/
fixmystreet.maps.config = function() {
- var permalink_id;
- if ($('#map_permalink').length) {
- permalink_id = 'map_permalink';
- }
-
fixmystreet.controls = [
new OpenLayers.Control.ArgParserFMS(),
new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.PermalinkFMS(permalink_id),
+ new OpenLayers.Control.PermalinkFMS('map'),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
diff --git a/web/js/map-wmts-hounslow.js b/web/js/map-wmts-hounslow.js
index ea414a3d8..1f8927b3f 100644
--- a/web/js/map-wmts-hounslow.js
+++ b/web/js/map-wmts-hounslow.js
@@ -162,15 +162,10 @@ fixmystreet.maps.matrix_ids = [
* to setup the way the map should operate.
*/
fixmystreet.maps.config = function() {
- var permalink_id;
- if ($('#map_permalink').length) {
- permalink_id = 'map_permalink';
- }
-
fixmystreet.controls = [
new OpenLayers.Control.ArgParserFMS(),
new OpenLayers.Control.Navigation(),
- new OpenLayers.Control.PermalinkFMS(permalink_id),
+ new OpenLayers.Control.PermalinkFMS('map'),
new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
];
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 05:01:54 +0000