azkaban-aplcache

Issue #174 - Use variables for status colors.

2/13/2014 12:06:32 AM

David Z. Chen

Commit: 61d1ecc

Tree: 422c7e9

Parents: 1d9b82a

Changes

src/less/azkaban.less 1(+1 -0)

src/less/flow.less 55(+32 -23)

src/less/Makefile 1(+1 -0)

src/less/variables.less 12(+12 -0)

Details

src/less/azkaban.less 1(+1 -0)

diff --git a/src/less/azkaban.less b/src/less/azkaban.less
index f40468d..cc34abc 100644
--- a/src/less/azkaban.less
+++ b/src/less/azkaban.less
@@ -1,3 +1,4 @@
+@import "variables.less";
 @import "non-responsive.less";
 
 @import "base.less";

src/less/flow.less 55(+32 -23)

diff --git a/src/less/flow.less b/src/less/flow.less
index 782a1f8..565e73c 100644
--- a/src/less/flow.less
+++ b/src/less/flow.less
@@ -44,19 +44,19 @@
   }
 
   &.SUCCEEDED {
-    background-color: #5cb85c;
+    background-color: @flow-succeeded-color;
   }
 
   &.FAILED {
-    background-color: #d9534f;
+    background-color: @flow-failed-color;
   }
   
   &.KILLED {
-    background-color: #d9534f;
+    background-color: @flow-killed-color;
   }
 
   &.RUNNING {
-    background-color: #3398cc;	
+    background-color: @flow-running-color;
     background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
     background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
     background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -67,11 +67,11 @@
   }
 
   &.QUEUED {
-    background-color: #009fc9;
+    background-color: @flow-queued-color;
   }
   
   &.CANCELLED {
-    background-color: #ff9999;
+    background-color: @flow-cancelled-color;
   }
 }
 
@@ -94,68 +94,77 @@ td {
     margin-top: 2px;
     
     &.SUCCEEDED {
-      background-color: #5cb85c;
+      background-color: @flow-succeeded-color;
     }
 
     &.FAILED {
-      background-color: #d9534f;
+      background-color: @flow-failed-color;
     }
     
     &.KILLED {
-      background-color: #d9534f;
+      background-color: @flow-killed-color;
     }
 
     &.PAUSED {
-      background-color: #c82123;
+      background-color: @flow-paused-color;
     }
 
     &.READY,
     &.UNKNOWN,
     &.PREPARING {
-      background-color: #ccc;
+      background-color: @flow-default-color;
     }
 
     &.RUNNING {
-      background-color: #3398cc;	
+      background-color: @flow-running-color;
     }
 
     &.FAILED_FINISHING {
-      background-color: #f19153;	
+      background-color: @flow-failed-finishing-color;
     }
 
     &.DISABLED,
     &.SKIPPED {
-      background-color: #aaa;	
+      background-color: @flow-disabled-color;
     }
 
     &.CANCELLED {
-      background-color: #ff9999;
+      background-color: @flow-cancelled-color;
     }
   }
 }
 
 #flowStatus {
   &.SKIPPED {
-    color: #aaa;
+    color: @flow-disabled-color;
   }
 
   &.SUCCEEDED {
-    color: #4e911e;
+    color: @flow-succeeded-color;
   }
 
   &.RUNNING {
-    color: #009fc9;
+    color: @flow-running-color;
   }
 
   &.PAUSED {
-    color: #c92123;
+    color: @flow-paused-color;
+  }
+
+  &.FAILED {
+    color: @flow-failed-color;
+  }
+
+  &.KILLED {
+    color: @flow-killed-color;
   }
 
-  &.FAILED,
-  &.FAILED_FINISHING,
-  &.KILLED,
   &.CANCELLED {
-    color: #cc0000;
+    color: @flow-cancelled-color;
+  }
+
+  &.FAILED_FINISHING {
+    color: @flow-failed-finishing-color;
   }
 }

src/less/Makefile 1(+1 -0)

diff --git a/src/less/Makefile b/src/less/Makefile
index c25438a..8e8eb0c 100644
--- a/src/less/Makefile
+++ b/src/less/Makefile
@@ -8,6 +8,7 @@ all: $(OBJ)
 
 azkaban_css_DEPS = \
 	azkaban.less \
+	variables.less \
 	base.less \
 	context-menu.less \
 	flow.less \

src/less/variables.less 12(+12 -0)

diff --git a/src/less/variables.less b/src/less/variables.less
new file mode 100644
index 0000000..078d2b2
--- /dev/null
+++ b/src/less/variables.less
@@ -0,0 +1,12 @@
+
+// Flow colors
+@flow-succeeded-color: #5cb85c;
+@flow-failed-color: #d9534f;
+@flow-killed-color: #d9534f;
+@flow-paused-color: #c82123;
+@flow-running-color: #3398cc;
+@flow-failed-finishing-color: #f19153;
+@flow-cancelled-color: #ff9999;
+@flow-queued-color: #009fc9;
+@flow-disabled-color: #aaa;
+@flow-default-color: #ccc;