aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixmystreet/images/inbox-in-circle-100px.pngbin0 -> 1725 bytes
-rw-r--r--web/cobrands/greenwich/layout.scss2
-rw-r--r--web/cobrands/harrogate/layout.scss12
-rw-r--r--web/cobrands/sass/_base.scss5
-rw-r--r--web/cobrands/sass/_layout.scss12
5 files changed, 18 insertions, 13 deletions
diff --git a/web/cobrands/fixmystreet/images/inbox-in-circle-100px.png b/web/cobrands/fixmystreet/images/inbox-in-circle-100px.png
new file mode 100644
index 000000000..d06685489
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/inbox-in-circle-100px.png
Binary files differ
diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss
index 2e0ce47f0..8d57949a0 100644
--- a/web/cobrands/greenwich/layout.scss
+++ b/web/cobrands/greenwich/layout.scss
@@ -16,8 +16,6 @@ $fixed_page_width: 990px;
.ie6 #site-logo,
body.frontpage #site-logo,
.ie6 body.frontpage #site-logo,
-body.authpage #site-logo,
-.ie6 body.authpage #site-logo,
body.twothirdswidthpage #site-logo,
.ie6 body.twothirdswidthpage #site-logo
{
diff --git a/web/cobrands/harrogate/layout.scss b/web/cobrands/harrogate/layout.scss
index 480a07f5d..dba7ed5b0 100644
--- a/web/cobrands/harrogate/layout.scss
+++ b/web/cobrands/harrogate/layout.scss
@@ -8,9 +8,6 @@
body.frontpage #site-logo,
.ie6 body.frontpage #site-logo,
- body.authpage #site-logo,
- .ie6 body.authpage #site-logo,
-
body.twothirdswidthpage #site-logo,
.ie6 body.twothirdswidthpage #site-logo
{
@@ -29,9 +26,6 @@
body.twothirdswidthpage #site-header,
.ie6 body.twothirdswidthpage #site-header,
- body.authpage #site-header,
- .ie6 body.authpage #site-header,
-
body.mappage #site-header,
.ie6 body.mappage #site-header,
body.mappage .nav-wrapper-2,
@@ -58,11 +52,7 @@
}
}
-body.fullwidthpage #main-nav,
-body.frontpage #main-nav,
-body.twothirdswidthpage #main-nav,
-body.authpage #main-nav
-{
+#main-nav {
margin-top: 3.2em;
}
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 9c63c77a8..15e26eddd 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -1603,10 +1603,15 @@ table.nicetable {
text-align: center;
background: transparent url(/cobrands/fixmystreet/images/tick-in-circle-100px.png) center 1em no-repeat;
+
&.confirmation-header--failure {
background-image: url(/cobrands/fixmystreet/images/sad-face-in-circle-100px.png);
}
+ &.confirmation-header--inbox {
+ background-image: url(/cobrands/fixmystreet/images/inbox-in-circle-100px.png);
+ }
+
h1, h2 {
margin: 0;
line-height: 1.2em;
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index ea85c0f13..26460c580 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -498,6 +498,18 @@ body.twothirdswidthpage {
}
}
+// Centre the login and password change pages,
+// but keep them narrow to match the report sidebar
+body.authpage {
+ .content {
+ margin-#{$left}: auto;
+ margin-#{$right}: auto;
+ margin-bottom: 0;
+ box-shadow: none;
+ padding: 1em; // same as .twothirdswidthpage .content
+ }
+}
+
// table wrapper - this enables anything to become a
// table with div children as table cells