aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixmystreet/staff.js11
-rw-r--r--web/cobrands/oxfordshire/base.scss4
-rw-r--r--web/cobrands/oxfordshire/layout.scss4
-rw-r--r--web/cobrands/sass/_base.scss26
-rw-r--r--web/cobrands/sass/_layout.scss7
5 files changed, 45 insertions, 7 deletions
diff --git a/web/cobrands/fixmystreet/staff.js b/web/cobrands/fixmystreet/staff.js
index 23d2a5a0d..b1bd9ee54 100644
--- a/web/cobrands/fixmystreet/staff.js
+++ b/web/cobrands/fixmystreet/staff.js
@@ -263,6 +263,17 @@ $.extend(fixmystreet.set_up, {
$("form#report_inspect_form input[name=longitude]").val(latlon.lon);
});
}
+
+ // Make the "Provide an update" form toggleable, and hide it by default.
+ // (Inspectors will normally just use the #public_update box instead).
+ var $updateFormH2 = $('.update-form-heading');
+ var $updateFormBtn = $('<button>').insertBefore( $updateFormH2 );
+ $updateFormH2.hide().nextAll().hide();
+ $updateFormBtn.addClass('btn btn--provide-update');
+ $updateFormBtn.text( $updateFormH2.text() );
+ $updateFormBtn.on('click', function(){
+ $updateFormH2.nextAll().toggle();
+ });
},
moderation: function() {
diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss
index 49a1ac66c..9807acbf2 100644
--- a/web/cobrands/oxfordshire/base.scss
+++ b/web/cobrands/oxfordshire/base.scss
@@ -77,6 +77,10 @@ dd, p {
}
}
+#side-inspect {
+ background-color: #deead2; // darker version of $oxfordshire_very_light_green
+}
+
.btn-primary {
@include button-reset(
$oxfordshire_button_top,
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index 726b298ff..048b65e80 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -226,10 +226,6 @@ body.mappage {
background-color: $oxfordshire_very_light_green;
}
-#side-inspect {
- background-color: #deead2;
-}
-
.item-list--reports h3 {
color: $oxfordshire_link_colour;
}
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index f7e67bdc2..7f629971e 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -600,17 +600,21 @@ body.mappage .wrapper {
display: block;
background-color: #f5f5f5;
background-repeat: no-repeat;
- color:#333;
+ color: #333 !important;
padding:4em 2em 1em;
text-transform:uppercase;
font: {
size:0.6875em;
family: $meta-font;
+ weight: normal;
}
+ line-height: 1.2em;
+ white-space: normal;
+ border-radius: 0;
&:hover, &.hover {
text-decoration:none;
background-color:#333;
- color:#fff;
+ color: #fff !important;
}
&.abuse {
background-image: url($image-sprite);
@@ -833,6 +837,12 @@ input.final-submit {
}
}
+.btn--provide-update {
+ display: block;
+ width: 100%;
+ margin-bottom: 1em;
+}
+
.btn--block {
display: block;
text-align: center;
@@ -1844,6 +1854,18 @@ label .muted {
}
}
+// The coloured sidebar column on .with-actions pages.
+// On narrow screens, it becomes a full-width section.
+#side-inspect {
+ padding: 1em;
+ margin: 0 -1em;
+ background-color: #E9F2FF;
+}
+
+.inspect-form-heading {
+ margin-top: 0;
+}
+
.inspect-section {
border-top: 1px solid rgba(0, 0, 0, 0.2);
padding-top: 1.5em;
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 7e56d31bd..afe9fdc9a 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -776,6 +776,7 @@ body.authpage {
border:none;
a, input[type=submit] {
font-size: 0.75em;
+ line-height: 18px; // match `body`
color:#666;
padding: flip(0.5em 1.5em 0.5em 0, 0.5em 0 0.5em 1.5em);
text-transform:none;
@@ -943,7 +944,11 @@ textarea.form-error {
// The coloured sidebar column on .with-actions pages.
#side-inspect {
- background-color: #E9F2FF;
+ margin: 0;
+}
+
+.inspect-form-heading {
+ display: none;
}
// More general notes