aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2016-03-29 18:00:07 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2016-03-30 15:58:55 +0100
commitf4064c90d64b3a3ae6e168ff06c0202c4c1d7c50 (patch)
tree3d3da8f8426df7791d693ee6c2cbbf729fbad876 /web
parente994554ec343239c4c5235338f5fd04046f247b8 (diff)
Switch list item heading from h4 to h3.
This stops the front page header nesting skipping a level.
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixamingata/layout.scss3
-rw-r--r--web/cobrands/fixmystreet.com/layout.scss3
-rw-r--r--web/cobrands/sass/_base.scss17
-rw-r--r--web/js/fixmystreet.js12
4 files changed, 20 insertions, 15 deletions
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index e8cbdab5e..442874360 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -61,7 +61,8 @@ noindex:-o-prefocus, #site-header {
font-family: sans-serif;
}
-h3, h4 {
+h3, h4,
+.item-list__heading {
font-weight: bold;
}
diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss
index 81c3b3d54..14eccfd1e 100644
--- a/web/cobrands/fixmystreet.com/layout.scss
+++ b/web/cobrands/fixmystreet.com/layout.scss
@@ -59,7 +59,8 @@ noindex:-o-prefocus, #site-header {
font-family: sans-serif;
}
-h3, h4 {
+h3, h4,
+.item-list__heading {
font-weight: bold;
}
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index e03bec486..59af6a71f 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -903,7 +903,7 @@ input.final-submit {
margin-bottom: 0.5em;
}
-.item-list__item--link {
+%item-list__item--link {
padding: 0;
a {
color: #222222;
@@ -917,11 +917,11 @@ input.final-submit {
}
.item-list--wards__item {
- @extend .item-list__item--link;
+ @extend %item-list__item--link;
}
.item-list--reports__item {
- @extend .item-list__item--link;
+ @extend %item-list__item--link;
a {
@include clearfix;
padding: flip(0 0 0 1em, 0 1em 0 0);
@@ -932,16 +932,19 @@ input.final-submit {
height: auto;
margin-#{$left}: 1em;
}
- h4 {
- padding-top: 0.25em;
- margin: 0;
- }
small {
color: #666;
display: block;
padding: 0.25em 0;
}
}
+.item-list__heading {
+ font-size: 1em;
+ font-weight: normal;
+ line-height: 1.5;
+ padding-top: 0.25em;
+ margin: 0;
+}
.item-list__item--empty p {
margin: 0;
diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js
index 312a3e294..07c1a1a6b 100644
--- a/web/js/fixmystreet.js
+++ b/web/js/fixmystreet.js
@@ -136,12 +136,12 @@ $(function(){
// Geolocation
if (geo_position_js.init()) {
- var link = '<a href="#LINK" id="geolocate_link">&hellip; ' + translation_strings.geolocate + '</a>';
- $('form[action="/alert/list"]').append(link.replace('LINK','alert/list'));
+ var link = '<a href="LINK" id="geolocate_link">&hellip; ' + translation_strings.geolocate + '</a>';
+ $('form[action="/alert/list"]').append(link.replace('LINK','/alert/list'));
if ($('body.frontpage').length) {
- $('#postcodeForm').after(link.replace('LINK','around'));
+ $('#postcodeForm').after(link.replace('LINK','/around'));
} else{
- $('#postcodeForm').append(link.replace('LINK','around'));
+ $('#postcodeForm').append(link.replace('LINK','/around'));
}
$('#geolocate_link').click(function(e) {
var $link = $(this);
@@ -157,8 +157,8 @@ $(function(){
$link.find('img').remove();
var latitude = pos.coords.latitude;
var longitude = pos.coords.longitude;
- var page = $link.attr('href').substr(1);
- location.href = '/' + page + '?latitude=' + latitude + ';longitude=' + longitude;
+ var page = $link.attr('href');
+ location.href = page + '?latitude=' + latitude + ';longitude=' + longitude;
}, function(err) {
$link.find('img').remove();
if (err.code == 1) { // User said no