aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-10-12 14:34:44 +0100
committerMatthew Somerville <matthew@mysociety.org>2012-10-12 14:34:44 +0100
commitc93bd58fbe66146ea57a836ba79ac024d4da45e8 (patch)
tree52df00ea77c40e78fcaae3be95db10e08f135eb3
parent2d6757a8032db76859f6cdb5178879b3e9b719cc (diff)
Add padding, background colour, other bits to fix #307.
-rw-r--r--templates/web/fixmystreet/report/display.html6
-rw-r--r--web/cobrands/fixmystreet/_base.scss4
-rw-r--r--web/cobrands/fixmystreet/_layout.scss11
3 files changed, 17 insertions, 4 deletions
diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html
index 65a3980b6..dce8efab2 100644
--- a/templates/web/fixmystreet/report/display.html
+++ b/templates/web/fixmystreet/report/display.html
@@ -41,9 +41,9 @@
<div id="report-updates-data" class="hidden-js">
<form action="[% c.uri_for( '/alert/subscribe' ) %]" method="post">
- <p><a href="[% c.uri_for( '/rss', problem.id ) %]">
- <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0" style="float: right">
- </a></p>
+ <a href="[% c.uri_for( '/rss', problem.id ) %]">
+ <img src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% loc('RSS feed of updates to this problem' ) %]" border="0">
+ </a>
<p>[% loc('Receive email when updates are left on this problem.' ) %]</p>
<fieldset>
<label class="hidden n" for="alert_rznvy">[% loc('Your email') %]</label>
diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss
index 900f4010e..1173e3061 100644
--- a/web/cobrands/fixmystreet/_base.scss
+++ b/web/cobrands/fixmystreet/_base.scss
@@ -635,6 +635,10 @@ p.label-valid {
}
}
+#report-updates-data img {
+ float: right;
+}
+
#report-share iframe {
vertical-align: top;
}
diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss
index 5262decc6..855e453b8 100644
--- a/web/cobrands/fixmystreet/_layout.scss
+++ b/web/cobrands/fixmystreet/_layout.scss
@@ -203,7 +203,7 @@ h1 {
margin-top: 3em;
margin-bottom: -1em;
margin-left: 0.5em;
- padding: 1em 1em 3em;
+ padding: 1em 1em 10em;
background: #fff;
@include box-shadow(0px 0px 6px 1px #000);
}
@@ -623,6 +623,15 @@ body.twothirdswidthpage {
padding-top: 0;
}
+// If JS is disabled, these are still CSS positioned, so don't want behind shining through.
+#report-share, #report-updates-data {
+ background-color: #fff;
+}
+// Prevent gap in non-JS, and looks better with JS, due to some padding/margin effect.
+#report-updates-data fieldset {
+ margin-bottom: 0;
+}
+
// pokes over the RHS with a little triangle
.big-green-banner {
top:auto;