aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-06-03 13:35:39 +0100
committerLouise Crow <louise.crow@gmail.com>2014-06-04 11:32:54 +0100
commit52fb42d5c10ba711fef3a124a6441e8292ff5e81 (patch)
tree1ee2f49feeb3d4768f49688a8cb450b8285792ca
parentbba201023bc3637c43e586f329a6c2b5ea746ef0 (diff)
Update icons, set colour constants for success/failure to match.
-rw-r--r--assets/images/status/classification.pngbin698 -> 878 bytes
-rw-r--r--assets/images/status/classification@2x.pngbin796 -> 1080 bytes
-rw-r--r--assets/images/status/delayed.pngbin479 -> 644 bytes
-rw-r--r--assets/images/status/delayed@2x.pngbin545 -> 857 bytes
-rw-r--r--assets/images/status/delivery_error.pngbin665 -> 884 bytes
-rw-r--r--assets/images/status/delivery_error@2x.pngbin686 -> 1000 bytes
-rw-r--r--assets/images/status/locked.pngbin649 -> 747 bytes
-rw-r--r--assets/images/status/locked@2x.pngbin770 -> 1062 bytes
-rw-r--r--assets/images/status/notheld.pngbin751 -> 827 bytes
-rw-r--r--assets/images/status/notheld@2x.pngbin778 -> 1048 bytes
-rw-r--r--assets/images/status/overdue.pngbin834 -> 912 bytes
-rw-r--r--assets/images/status/overdue@2x.pngbin1031 -> 1404 bytes
-rw-r--r--assets/images/status/partiallysuccessful.pngbin746 -> 926 bytes
-rw-r--r--assets/images/status/partiallysuccessful@2x.pngbin1041 -> 1441 bytes
-rw-r--r--assets/images/status/postal.pngbin575 -> 746 bytes
-rw-r--r--assets/images/status/postal@2x.pngbin711 -> 1138 bytes
-rw-r--r--assets/images/status/refused.pngbin590 -> 780 bytes
-rw-r--r--assets/images/status/refused@2x.pngbin528 -> 876 bytes
-rw-r--r--assets/images/status/reported.pngbin610 -> 708 bytes
-rw-r--r--assets/images/status/reported@2x.pngbin830 -> 1084 bytes
-rw-r--r--assets/images/status/review.pngbin828 -> 1016 bytes
-rw-r--r--assets/images/status/review@2x.pngbin950 -> 1387 bytes
-rw-r--r--assets/images/status/successful.pngbin655 -> 810 bytes
-rw-r--r--assets/images/status/successful@2x.pngbin872 -> 1297 bytes
-rw-r--r--assets/images/status/unusual.pngbin717 -> 931 bytes
-rw-r--r--assets/images/status/unusual@2x.pngbin1054 -> 1447 bytes
-rw-r--r--assets/images/status/waiting.pngbin817 -> 1047 bytes
-rw-r--r--assets/images/status/waiting@2x.pngbin1021 -> 1531 bytes
-rw-r--r--assets/images/status/withdrawn.pngbin661 -> 838 bytes
-rw-r--r--assets/images/status/withdrawn@2x.pngbin831 -> 1263 bytes
-rw-r--r--assets/stylesheets/responsive/custom.scss136
31 files changed, 18 insertions, 118 deletions
diff --git a/assets/images/status/classification.png b/assets/images/status/classification.png
index d48a9fa..32d8067 100644
--- a/assets/images/status/classification.png
+++ b/assets/images/status/classification.png
Binary files differ
diff --git a/assets/images/status/classification@2x.png b/assets/images/status/classification@2x.png
index ce659b7..f3991db 100644
--- a/assets/images/status/classification@2x.png
+++ b/assets/images/status/classification@2x.png
Binary files differ
diff --git a/assets/images/status/delayed.png b/assets/images/status/delayed.png
index 6e1e102..515e42c 100644
--- a/assets/images/status/delayed.png
+++ b/assets/images/status/delayed.png
Binary files differ
diff --git a/assets/images/status/delayed@2x.png b/assets/images/status/delayed@2x.png
index 1eee050..d08d207 100644
--- a/assets/images/status/delayed@2x.png
+++ b/assets/images/status/delayed@2x.png
Binary files differ
diff --git a/assets/images/status/delivery_error.png b/assets/images/status/delivery_error.png
index b84c864..a6d7280 100644
--- a/assets/images/status/delivery_error.png
+++ b/assets/images/status/delivery_error.png
Binary files differ
diff --git a/assets/images/status/delivery_error@2x.png b/assets/images/status/delivery_error@2x.png
index dfc1077..8bb2400 100644
--- a/assets/images/status/delivery_error@2x.png
+++ b/assets/images/status/delivery_error@2x.png
Binary files differ
diff --git a/assets/images/status/locked.png b/assets/images/status/locked.png
index e47ea90..7201f26 100644
--- a/assets/images/status/locked.png
+++ b/assets/images/status/locked.png
Binary files differ
diff --git a/assets/images/status/locked@2x.png b/assets/images/status/locked@2x.png
index e93ade5..772fd2d 100644
--- a/assets/images/status/locked@2x.png
+++ b/assets/images/status/locked@2x.png
Binary files differ
diff --git a/assets/images/status/notheld.png b/assets/images/status/notheld.png
index cb61b8d..5a41cfb 100644
--- a/assets/images/status/notheld.png
+++ b/assets/images/status/notheld.png
Binary files differ
diff --git a/assets/images/status/notheld@2x.png b/assets/images/status/notheld@2x.png
index b223deb..d90b2fb 100644
--- a/assets/images/status/notheld@2x.png
+++ b/assets/images/status/notheld@2x.png
Binary files differ
diff --git a/assets/images/status/overdue.png b/assets/images/status/overdue.png
index 28d8b43..29bf083 100644
--- a/assets/images/status/overdue.png
+++ b/assets/images/status/overdue.png
Binary files differ
diff --git a/assets/images/status/overdue@2x.png b/assets/images/status/overdue@2x.png
index 5276e86..fcaa662 100644
--- a/assets/images/status/overdue@2x.png
+++ b/assets/images/status/overdue@2x.png
Binary files differ
diff --git a/assets/images/status/partiallysuccessful.png b/assets/images/status/partiallysuccessful.png
index 75ec6a7..0368a2e 100644
--- a/assets/images/status/partiallysuccessful.png
+++ b/assets/images/status/partiallysuccessful.png
Binary files differ
diff --git a/assets/images/status/partiallysuccessful@2x.png b/assets/images/status/partiallysuccessful@2x.png
index c7b6763..81688d9 100644
--- a/assets/images/status/partiallysuccessful@2x.png
+++ b/assets/images/status/partiallysuccessful@2x.png
Binary files differ
diff --git a/assets/images/status/postal.png b/assets/images/status/postal.png
index 87c71d2..589cd9b 100644
--- a/assets/images/status/postal.png
+++ b/assets/images/status/postal.png
Binary files differ
diff --git a/assets/images/status/postal@2x.png b/assets/images/status/postal@2x.png
index 064665a..e08aea5 100644
--- a/assets/images/status/postal@2x.png
+++ b/assets/images/status/postal@2x.png
Binary files differ
diff --git a/assets/images/status/refused.png b/assets/images/status/refused.png
index d9a6e57..a184e72 100644
--- a/assets/images/status/refused.png
+++ b/assets/images/status/refused.png
Binary files differ
diff --git a/assets/images/status/refused@2x.png b/assets/images/status/refused@2x.png
index 735d047..7605335 100644
--- a/assets/images/status/refused@2x.png
+++ b/assets/images/status/refused@2x.png
Binary files differ
diff --git a/assets/images/status/reported.png b/assets/images/status/reported.png
index c2c918e..f61b364 100644
--- a/assets/images/status/reported.png
+++ b/assets/images/status/reported.png
Binary files differ
diff --git a/assets/images/status/reported@2x.png b/assets/images/status/reported@2x.png
index 98679a6..0139ecd 100644
--- a/assets/images/status/reported@2x.png
+++ b/assets/images/status/reported@2x.png
Binary files differ
diff --git a/assets/images/status/review.png b/assets/images/status/review.png
index 07440a8..f1412b9 100644
--- a/assets/images/status/review.png
+++ b/assets/images/status/review.png
Binary files differ
diff --git a/assets/images/status/review@2x.png b/assets/images/status/review@2x.png
index 594477c..5013074 100644
--- a/assets/images/status/review@2x.png
+++ b/assets/images/status/review@2x.png
Binary files differ
diff --git a/assets/images/status/successful.png b/assets/images/status/successful.png
index 94294b2..042bea9 100644
--- a/assets/images/status/successful.png
+++ b/assets/images/status/successful.png
Binary files differ
diff --git a/assets/images/status/successful@2x.png b/assets/images/status/successful@2x.png
index e851892..b311012 100644
--- a/assets/images/status/successful@2x.png
+++ b/assets/images/status/successful@2x.png
Binary files differ
diff --git a/assets/images/status/unusual.png b/assets/images/status/unusual.png
index 5b078f7..abca813 100644
--- a/assets/images/status/unusual.png
+++ b/assets/images/status/unusual.png
Binary files differ
diff --git a/assets/images/status/unusual@2x.png b/assets/images/status/unusual@2x.png
index e6049ee..2e47740 100644
--- a/assets/images/status/unusual@2x.png
+++ b/assets/images/status/unusual@2x.png
Binary files differ
diff --git a/assets/images/status/waiting.png b/assets/images/status/waiting.png
index a291f0f..7af9696 100644
--- a/assets/images/status/waiting.png
+++ b/assets/images/status/waiting.png
Binary files differ
diff --git a/assets/images/status/waiting@2x.png b/assets/images/status/waiting@2x.png
index e2c53f1..174fd7d 100644
--- a/assets/images/status/waiting@2x.png
+++ b/assets/images/status/waiting@2x.png
Binary files differ
diff --git a/assets/images/status/withdrawn.png b/assets/images/status/withdrawn.png
index 73f142c..c629418 100644
--- a/assets/images/status/withdrawn.png
+++ b/assets/images/status/withdrawn.png
Binary files differ
diff --git a/assets/images/status/withdrawn@2x.png b/assets/images/status/withdrawn@2x.png
index d98055c..164056c 100644
--- a/assets/images/status/withdrawn@2x.png
+++ b/assets/images/status/withdrawn@2x.png
Binary files differ
diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss
index fa7fda6..b370fb4 100644
--- a/assets/stylesheets/responsive/custom.scss
+++ b/assets/stylesheets/responsive/custom.scss
@@ -30,9 +30,9 @@ $outgoing-correspondence-color: #6d918d;
$correspondence-bg: #fff;
$correspondence-shadow: #d3d3d3;
-$status-success: #839310;
-$status-failure: #d6593b;
-$status-pending: #d69457;
+$status-success: #aab26e;
+$status-failure: #ff7959;
+$status-pending: #e69e5d;
$notice-bg: #D7DABD;
$notice-border: #839310;
@@ -472,129 +472,29 @@ a.link_to_this {
}
/* Status lines and icons */
-.icon_waiting_classification {
- background-image:image-url('status/classification.png');
- color: $status-pending;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/classification@2x.png');
- }
-}
-
-.icon_waiting_response,.icon_waiting_clarification {
- background-image:image-url('status/waiting.png');
+.icon_waiting_classification,
+.icon_waiting_response,
+.icon_waiting_clarification,
+.icon_requires_admin,
+.icon_waiting_response_overdue,
+.icon_gone_postal,
+.icon_error_message,
+.icon_internal_review,
+.icon_user_withdrawn {
color: $status-pending;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/waiting@2x.png');
- }
}
-.icon_attention_requested {
- background-image:image-url('status/reported.png');
+.icon_attention_requested,
+.icon_not_held,
+.icon_waiting_response_very_overdue,
+.icon_failed,
+.icon_rejected {
color: $status-failure;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/reported@2x.png');
- }
-}
-
-.icon_not_held {
- background-image:image-url('status/notheld.png');
- color: $status-failure;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/notheld@2x.png');
- }
-}
-
-.icon_successful {
- background-image:image-url('status/successful.png');
- color: $status-success;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/successful@2x.png');
- }
}
+.icon_successful,
.icon_partially_successful {
- background-image:image-url('status/partiallysuccessful.png');
color: $status-success;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/partiallysuccessful@2x.png');
- }
-}
-
-.icon_requires_admin {
- background-image:image-url('status/unusual.png');
- color: $status-pending;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/unusual@2x.png');
- }
-}
-
-.icon_waiting_response_overdue {
- background-image:image-url('status/delayed.png');
- color: $status-pending;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/delayed@2x.png');
- }
-}
-
-.icon_waiting_response_very_overdue{
- background-image:image-url('status/overdue.png');
- color: $status-failure;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/overdue@2x.png');
- }
-}
-
-.icon_gone_postal {
- background-image:image-url('status/postal.png');
- color: $status-pending;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/postal@2x.png');
- }
-}
-
-.icon_error_message {
- background-image:image-url('status/delivery_error.png');
- color: $status-pending;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/delivery_error@2x.png');
- }
-}
-
-.icon_internal_review {
- background-image:image-url('status/review.png');
- color: $status-pending;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/review@2x.png');
- }
-}
-
-.icon_user_withdrawn {
- background-image:image-url('status/withdrawn.png');
- color: $status-pending;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/withdrawn@2x.png');
- }
-}
-
-.icon_failed,.icon_rejected {
- background-image:image-url('status/refused.png');
- color: $status-failure;
- background-size: 22px 22px;
- @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
- background-image:image-url('status/refused@2x.png');
- }
}
/* Attachments*/