Merge branch 'feature/responsive-icon-css' into rails-3-develop

29 files changed, 106 insertions, 22 deletions

diff --git a/app/assets/images/status/classification.png b/app/assets/images/status/classification.png
new file mode 100644
index 000000000..dcf4009f3
--- /dev/null
+++ b/app/assets/images/status/classification.png
diff --git a/app/assets/images/status/classification@2x.png b/app/assets/images/status/classification@2x.png
new file mode 100644
index 000000000..dcf4009f3
--- /dev/null
+++ b/app/assets/images/status/classification@2x.png
diff --git a/app/assets/images/status/delayed.png b/app/assets/images/status/delayed.png
new file mode 100644
index 000000000..637fed8d9
--- /dev/null
+++ b/app/assets/images/status/delayed.png
diff --git a/app/assets/images/status/delayed@2x.png b/app/assets/images/status/delayed@2x.png
new file mode 100644
index 000000000..637fed8d9
--- /dev/null
+++ b/app/assets/images/status/delayed@2x.png
diff --git a/app/assets/images/status/delivery_error.png b/app/assets/images/status/delivery_error.png
new file mode 100644
index 000000000..5865dd1e1
--- /dev/null
+++ b/app/assets/images/status/delivery_error.png
diff --git a/app/assets/images/status/delivery_error@2x.png b/app/assets/images/status/delivery_error@2x.png
new file mode 100644
index 000000000..5865dd1e1
--- /dev/null
+++ b/app/assets/images/status/delivery_error@2x.png
diff --git a/app/assets/images/status/notheld.png b/app/assets/images/status/notheld.png
new file mode 100644
index 000000000..9d20ac2e7
--- /dev/null
+++ b/app/assets/images/status/notheld.png
diff --git a/app/assets/images/status/notheld@2x.png b/app/assets/images/status/notheld@2x.png
new file mode 100644
index 000000000..9d20ac2e7
--- /dev/null
+++ b/app/assets/images/status/notheld@2x.png
diff --git a/app/assets/images/status/overdue.png b/app/assets/images/status/overdue.png
new file mode 100644
index 000000000..637fed8d9
--- /dev/null
+++ b/app/assets/images/status/overdue.png
diff --git a/app/assets/images/status/overdue@2x.png b/app/assets/images/status/overdue@2x.png
new file mode 100644
index 000000000..637fed8d9
--- /dev/null
+++ b/app/assets/images/status/overdue@2x.png
diff --git a/app/assets/images/status/partiallysuccessful.png b/app/assets/images/status/partiallysuccessful.png
new file mode 100644
index 000000000..2ff49770a
--- /dev/null
+++ b/app/assets/images/status/partiallysuccessful.png
diff --git a/app/assets/images/status/partiallysuccessful@2x.png b/app/assets/images/status/partiallysuccessful@2x.png
new file mode 100644
index 000000000..2ff49770a
--- /dev/null
+++ b/app/assets/images/status/partiallysuccessful@2x.png
diff --git a/app/assets/images/status/postal.png b/app/assets/images/status/postal.png
new file mode 100644
index 000000000..00df771ac
--- /dev/null
+++ b/app/assets/images/status/postal.png
diff --git a/app/assets/images/status/postal@2x.png b/app/assets/images/status/postal@2x.png
new file mode 100644
index 000000000..00df771ac
--- /dev/null
+++ b/app/assets/images/status/postal@2x.png
diff --git a/app/assets/images/status/refused.png b/app/assets/images/status/refused.png
new file mode 100644
index 000000000..1f768af5e
--- /dev/null
+++ b/app/assets/images/status/refused.png
diff --git a/app/assets/images/status/refused@2x.png b/app/assets/images/status/refused@2x.png
new file mode 100644
index 000000000..1f768af5e
--- /dev/null
+++ b/app/assets/images/status/refused@2x.png
diff --git a/app/assets/images/status/reported.png b/app/assets/images/status/reported.png
new file mode 100644
index 000000000..9d20ac2e7
--- /dev/null
+++ b/app/assets/images/status/reported.png
diff --git a/app/assets/images/status/reported@2x.png b/app/assets/images/status/reported@2x.png
new file mode 100644
index 000000000..9d20ac2e7
--- /dev/null
+++ b/app/assets/images/status/reported@2x.png
diff --git a/app/assets/images/status/review.png b/app/assets/images/status/review.png
new file mode 100644
index 000000000..639f72797
--- /dev/null
+++ b/app/assets/images/status/review.png
diff --git a/app/assets/images/status/review@2x.png b/app/assets/images/status/review@2x.png
new file mode 100644
index 000000000..639f72797
--- /dev/null
+++ b/app/assets/images/status/review@2x.png
diff --git a/app/assets/images/status/successful.png b/app/assets/images/status/successful.png
new file mode 100644
index 000000000..2ff49770a
--- /dev/null
+++ b/app/assets/images/status/successful.png
diff --git a/app/assets/images/status/successful@2x.png b/app/assets/images/status/successful@2x.png
new file mode 100644
index 000000000..2ff49770a
--- /dev/null
+++ b/app/assets/images/status/successful@2x.png
diff --git a/app/assets/images/status/unusual.png b/app/assets/images/status/unusual.png
new file mode 100644
index 000000000..637fed8d9
--- /dev/null
+++ b/app/assets/images/status/unusual.png
diff --git a/app/assets/images/status/unusual@2x.png b/app/assets/images/status/unusual@2x.png
new file mode 100644
index 000000000..637fed8d9
--- /dev/null
+++ b/app/assets/images/status/unusual@2x.png
diff --git a/app/assets/images/status/waiting.png b/app/assets/images/status/waiting.png
new file mode 100644
index 000000000..dcf4009f3
--- /dev/null
+++ b/app/assets/images/status/waiting.png
diff --git a/app/assets/images/status/waiting@2x.png b/app/assets/images/status/waiting@2x.png
new file mode 100644
index 000000000..dcf4009f3
--- /dev/null
+++ b/app/assets/images/status/waiting@2x.png
diff --git a/app/assets/images/status/withdrawn.png b/app/assets/images/status/withdrawn.png
new file mode 100644
index 000000000..d56aa213f
--- /dev/null
+++ b/app/assets/images/status/withdrawn.png
diff --git a/app/assets/images/status/withdrawn@2x.png b/app/assets/images/status/withdrawn@2x.png
new file mode 100644
index 000000000..d56aa213f
--- /dev/null
+++ b/app/assets/images/status/withdrawn@2x.png
diff --git a/app/assets/stylesheets/responsive/_lists_style.scss b/app/assets/stylesheets/responsive/_lists_style.scss
index 762901a5f..9f18718f5 100644
--- a/app/assets/stylesheets/responsive/_lists_style.scss
+++ b/app/assets/stylesheets/responsive/_lists_style.scss
@@ -48,51 +48,135 @@
   }
 }
 
+$status-success: #69952F;
+$status-failure: #C1272D;
+$status-pending: #A68C2E;
+
 /* Status lines and icons */
-.icon_waiting_response,.icon_waiting_classification,.icon_waiting_clarification {
-  background-image:image-url('status-pending.png');
-  color:#A68C2E;
+.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');
+  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');
+  color: $status-pending;
+  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-pending;
+  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_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_not_held, .icon_attention_requested {
-  background-image:image-url('status-not-held.png');
-  color:#A68C2E;
+.icon_requires_admin {
+  background-image:image-url('status/unusual.png');
+  color: $status-failure;
+  background-size: 22px 22px;
+  @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
+    background-image:image-url('status/unusual@2x.png');
+  }
 }
 
-.icon_successful,.icon_partially_successful {
-  background-image:image-url('status-complete.png');
-  color:#69952F;
+.icon_waiting_response_overdue {
+  background-image:image-url('status/delayed.png');
+  color: $status-failure;
+  background-size: 22px 22px;
+  @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) {
+    background-image:image-url('status/delayed@2x.png');
+  }
 }
 
-.icon_requires_admin,.icon_waiting_response_overdue,.icon_waiting_response_very_overdue {
-  background-image:image-url('status-overdue.png');
-  color:#C1272D;
+.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-gone-postal.png');
-  color:#A68C2E;
+  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-error.png');
-  color:#C1272D;
+  background-image:image-url('status/delivery_error.png');
+  color: $status-failure;
+  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-internal-review.png');
-  color:#A68C2E;
+  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:#A68C2E;
+  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-denied.png');
-  color:#C1272D;
+  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');
+  }
 }
 
 #public_body_list {