diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/css/_main.scss | 35 | ||||
-rw-r--r-- | web/css/core.css | 6 | ||||
-rw-r--r-- | web/css/core.scss | 6 | ||||
-rw-r--r-- | web/css/main.css | 35 | ||||
-rw-r--r-- | web/js/fixmystreet.js | 2 | ||||
-rw-r--r-- | web/js/map-bing-ol.js | 6 |
6 files changed, 74 insertions, 16 deletions
diff --git a/web/css/_main.scss b/web/css/_main.scss index 44fd82b3b..0b9cf33ab 100644 --- a/web/css/_main.scss +++ b/web/css/_main.scss @@ -79,7 +79,23 @@ select, input, textarea { /* Can't put the margin in #mysociety because of above IE craziness */ #wrapper { - margin: 2em; + margin: 1em 2em 2em; +} + +#meta { + list-style-type: none; + margin: 0.25em 0 0 1em; + padding: 0; + font-size: 0.875em; + li { + display: inline; + margin: 0; + padding: 0 0 0 0.25em; + border-left: solid 1px $header_colour; + } + li:first-child { + border-left: none; + } } .v { @@ -111,6 +127,12 @@ select, input, textarea { a:hover, a:active { background-color: $header_colour; color: $header_back; + -moz-border-radius-topleft: 0.5em; + -webkit-border-top-left-radius: 0.5em; + border-radius-top-left: 0.5em; + -moz-border-radius-topright: 0.5em; + -webkit-border-top-right-radius: 0.5em; + border-radius-top-right: 0.5em; } } @@ -129,11 +151,10 @@ select, input, textarea { #footer { clear: both; - text-align: right; - font-size: 83%; - border-top: solid 1px $header_colour; - display: table; - margin: 2em 0 1em auto; - padding: 2px 4px; + text-align: center; + border-top: solid 2px $header_back; + width: 50%; + margin: 2em auto 0; + padding: 1em; } diff --git a/web/css/core.css b/web/css/core.css index 937bf533d..cb35000cd 100644 --- a/web/css/core.css +++ b/web/css/core.css @@ -144,6 +144,7 @@ background-color: #ffffff; } #mysociety p#copyright { float: right; + text-align: right; margin: 0 0 1em 0; font-size: 78%; } #mysociety #map { @@ -315,6 +316,11 @@ font-size: 80%; margin-top: 2em; } +.olControlAttribution { + bottom: 3px !important; + left: 3px; +} + @media print { #mysociety #map_box { float: none; diff --git a/web/css/core.scss b/web/css/core.scss index cbf15f16b..d845d6de4 100644 --- a/web/css/core.scss +++ b/web/css/core.scss @@ -226,6 +226,7 @@ $map_width: 500px; p#copyright { float: right; + text-align: right; margin: 0 0 1em 0; font-size: 78%; } @@ -519,6 +520,11 @@ $map_width: 500px; } +.olControlAttribution { + bottom: 3px !important; + left: 3px; +} + // Printing, SCSS doesn't handle @media nesting @media print { diff --git a/web/css/main.css b/web/css/main.css index ddea37970..686b74d40 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -77,7 +77,23 @@ select, input, textarea { /* Can't put the margin in #mysociety because of above IE craziness */ #wrapper { - margin: 2em; + margin: 1em 2em 2em; +} + +#meta { + list-style-type: none; + margin: 0.25em 0 0 1em; + padding: 0; + font-size: 0.875em; +} +#meta li { + display: inline; + margin: 0; + padding: 0 0 0 0.25em; + border-left: solid 1px #5e552b; +} +#meta li:first-child { + border-left: none; } .v { @@ -108,6 +124,12 @@ select, input, textarea { #navigation a:hover, #navigation a:active { background-color: #5e552b; color: #e3d595; + -moz-border-radius-topleft: 0.5em; + -webkit-border-top-left-radius: 0.5em; + border-radius-top-left: 0.5em; + -moz-border-radius-topright: 0.5em; + -webkit-border-top-right-radius: 0.5em; + border-radius-top-right: 0.5em; } #nav_new a { @@ -125,10 +147,9 @@ select, input, textarea { #footer { clear: both; - text-align: right; - font-size: 83%; - border-top: solid 1px #5e552b; - display: table; - margin: 2em 0 1em auto; - padding: 2px 4px; + text-align: center; + border-top: solid 2px #e3d595; + width: 50%; + margin: 2em auto 0; + padding: 1em; } diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index 7f6014c6c..50ccb2ac3 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -12,7 +12,7 @@ YAHOO.util.Event.onContentReady('pc', function() { YAHOO.util.Event.onContentReady('mapForm', function() { this.onsubmit = function() { - if (this.submit_problem) { + if (this.submit_problem) { this.onsubmit = function() { return false; }; } diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index c3c3b994e..75bce80d3 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -1,5 +1,6 @@ function set_map_config(perm) { fixmystreet.controls = [ + new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), new OpenLayers.Control.Navigation(), perm, @@ -9,6 +10,9 @@ function set_map_config(perm) { } OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { + attribution: '<a href="http://www.bing.com/maps/">' + + '<img border=0 src="http://dev.virtualearth.net/Branding/logo_powered_by.png"></a>', + initialize: function(name, options) { var url = []; options = OpenLayers.Util.extend({ @@ -18,7 +22,7 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { transitionEffect: "resize", sphericalMercator: true, buffer: 0, - attribution: "© Microsoft / OS 2010" + //attribution: "© Microsoft / OS 2010" }, options); var newArguments = [name, url, options]; OpenLayers.Layer.XYZ.prototype.initialize.apply(this, newArguments); |