From acacee59e2998f1263aa6e9cd61a394630c96aa1 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Wed, 30 Sep 2015 15:28:26 +0200
Subject: [PATCH] style escalation labels

---
 .../app/lib/app_post/pretty_date.coffee         |  2 --
 app/assets/stylesheets/zammad.scss              | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee
index a9b33eba7..8866818fd 100644
--- a/app/assets/javascripts/app/lib/app_post/pretty_date.coffee
+++ b/app/assets/javascripts/app/lib/app_post/pretty_date.coffee
@@ -15,8 +15,6 @@ class App.PrettyDate
         style = 'class="label label-danger"'
       else if diff > -60 * 60
         style = 'class="label label-warning"'
-      else
-        style = 'class="label label-success"'
 
     # remember past/future
     direction = 'future'
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index ce219a570..628d751ed 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -840,7 +840,9 @@ label,
 }
 
 /* circumventing the label:not(.inline-label) selector because it's too strong */
-.inline-label {
+.inline-label,
+.label.label-warning,
+.label.label-danger {
   font-size: inherit;
   font-weight: inherit;
   text-align: inherit;
@@ -857,6 +859,19 @@ label,
   cursor: pointer;
 }
 
+.label.label-warning,
+.label.label-danger {
+  background: none;
+}
+
+.label.label-warning {
+  color: $ok-color;
+}
+
+.label.label-danger {
+  color: $superbad-color;
+}
+
 fieldset {
   margin: 0 -4px;
   @extend .clearfix;