aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorZarino Zappia <mail@zarino.co.uk>2015-01-15 18:10:03 +0000
committerMatthew Somerville <matthew@mysociety.org>2015-02-19 18:25:50 +0000
commit6f997f16abba3b649d939f35abd7607076424fa9 (patch)
treefbd3df4509eea61f7becf382c09e333e96b44327 /web
parent61b0ea8be19a1db68d19508112afbe7a15814f36 (diff)
Simplifed "confirmation-header" for success pages.
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/fixmystreet/base.scss23
-rw-r--r--web/cobrands/fixmystreet/images/sad-face-in-circle-100px.pngbin0 -> 1875 bytes
-rw-r--r--web/cobrands/fixmystreet/images/tick-in-circle-100px.pngbin0 -> 1310 bytes
-rw-r--r--web/cobrands/sass/_base.scss53
-rw-r--r--web/cobrands/sass/_layout.scss8
5 files changed, 56 insertions, 28 deletions
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index 01be687a1..ff4f4df91 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -32,29 +32,6 @@
background: url($image-sprite) -3px -3px no-repeat;
}
-.confirmation-header {
- padding: 2em 1em;
-
- @media only screen and (min-width: 48em) {
- padding: 3em 0;
- text-align: center;
- }
-
- h1 {
- margin-top: 0;
- }
-
- p {
- font-size: 1.3em;
- line-height: 1.4em;
- margin-bottom: 0;
- }
-
- p + p {
- margin-top: 0.5em;
- }
-}
-
.next-steps {
margin: 0 -1em; // counteract padding on parent
background-color: #faf7e2;
diff --git a/web/cobrands/fixmystreet/images/sad-face-in-circle-100px.png b/web/cobrands/fixmystreet/images/sad-face-in-circle-100px.png
new file mode 100644
index 000000000..093c3ea06
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/sad-face-in-circle-100px.png
Binary files differ
diff --git a/web/cobrands/fixmystreet/images/tick-in-circle-100px.png b/web/cobrands/fixmystreet/images/tick-in-circle-100px.png
new file mode 100644
index 000000000..54647a012
--- /dev/null
+++ b/web/cobrands/fixmystreet/images/tick-in-circle-100px.png
Binary files differ
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 5bc1105cf..8e2a65d1b 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -64,13 +64,13 @@ h3 {
h4 {
font-size: 1em;
font-weight: normal;
- margin-bottom: 1em;
+ margin-bottom: 1em;
}
// default list styles
ul, ol {
font-size: 1em;
- margin-bottom: 2em;
+ margin-bottom: 2em;
margin-left: 2em;
padding:0;
}
@@ -171,7 +171,7 @@ a:visited {
&:hover,
&:active {
text-decoration:underline;
- color:#0D7CCE;
+ color:#0D7CCE;
}
}
@@ -711,7 +711,7 @@ a.button-left {
font-size: 1em;
line-height: 1;
margin:0;
- border:1px solid #999;
+ border:1px solid #999;
color:#333;
background: #eee;
@include border-radius(4px);
@@ -719,7 +719,7 @@ a.button-left {
color:#fff;
background:#777;
text-decoration: none;
- border:1px solid #666;
+ border:1px solid #666;
}
}
.button-right,
@@ -1577,4 +1577,47 @@ table.nicetable {
}
}
+.confirmation-header {
+ padding: 140px 0 2em;
+ 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);
+ }
+
+ h1, h2 {
+ margin: 0;
+ line-height: 1.2em;
+ }
+
+ h1 {
+ a {
+ text-decoration: underline;
+ color: inherit;
+
+ &:hover,
+ &:focus {
+ text-decoration: none;
+ color: #0BA7D1; // default link colour
+ }
+ }
+ }
+
+ h1 + h2,
+ h1 ~ p {
+ margin-top: 12px;
+ }
+
+ p {
+ color: #666666;
+ font-size: 1.2em;
+ margin-bottom: 0.5em;
+ }
+
+ & > :last-child {
+ margin-bottom: 0;
+ }
+}
+
@import "_admin";
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index d1cfb6be7..162bf30e1 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -1080,6 +1080,14 @@ body.frontpage {
}
}
+.confirmation-header {
+ width: 25em;
+ margin: 0 auto 1em;
+ text-align: left;
+ padding: 3em 0 3em 132px; // for tick icon
+ background-position: 0 2em;
+}
+
/* Admin interface */
.fms-admin-floated {