From f2c4c3bb1bcdd79d362ff48fec9308a4452d85e7 Mon Sep 17 00:00:00 2001
From: Bernd Erk <bernd.erk@icinga.org>
Date: Wed, 12 Nov 2014 16:19:00 +0100
Subject: [PATCH] Fix color codes and badges

---
 modules/monitoring/public/css/module.less | 8 ++------
 public/css/icinga/layout-colors.less      | 1 +
 public/css/icinga/layout-structure.less   | 3 +--
 public/css/icinga/login.less              | 6 +++---
 public/css/icinga/menu.less               | 4 ++--
 public/css/icinga/selection-toolbar.less  | 4 ++--
 public/css/icinga/widgets.less            | 1 -
 7 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 536c32bdc..5f01f19fc 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -78,12 +78,8 @@ div.contacts div.notification-periods {
 h3.tinystatesummary {
   line-height: 2em;
   font-size: 0.95em;
-  padding-left: 1em;
   margin-right: 1em;
-  background-color: #eee;
-  color: @colorTextDefault;
-  border: 1px solid #d9d9d9;
-  border-left: 5px solid #049baf;
+  border-bottom: 2px solid @colorPetrol;
 }
 
 h3.tinystatesummary a {
@@ -99,11 +95,11 @@ h3.tinystatesummary a:hover {
 /* State badges */
 span.state {
     font-size: 1em;
+    font-weight: 700;
     color: white;
     font-weight: bold;
     padding: 1px 2px;
     margin-right: 5px;
-    border-radius: 0.2em
 
 }
 
diff --git a/public/css/icinga/layout-colors.less b/public/css/icinga/layout-colors.less
index dcfbe8fe0..a898f6894 100644
--- a/public/css/icinga/layout-colors.less
+++ b/public/css/icinga/layout-colors.less
@@ -43,6 +43,7 @@
 @colorLinkDefault: #049baf;
 @colorTextDefault: #666;
 @colorTextDarkDefault: #555;
+@colorPetrol: #049baf;
 @colorOk: #44bb77;
 @colorWarning: #ffaa44;
 @colorWarningHandled: #ffcc66;
diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less
index 7b0a4c75f..9e9ffc932 100644
--- a/public/css/icinga/layout-structure.less
+++ b/public/css/icinga/layout-structure.less
@@ -152,9 +152,8 @@ html {
 .dashboard > div.container h1, .container .content h1, .container .controls h1, .content h3 {
   line-height: 2em;
   font-size: 1em;
-  padding-left: 1em;
   color: @colorTextDefault;
-  border-bottom: 2px solid #049baf;
+  border-bottom: 2px solid @colorPetrol;
 }
 
 .content h3 {
diff --git a/public/css/icinga/login.less b/public/css/icinga/login.less
index b06fa51f6..c84ecdb84 100644
--- a/public/css/icinga/login.less
+++ b/public/css/icinga/login.less
@@ -6,7 +6,7 @@
   height: 100%;
 
   .logo {
-    background-color: #049baf;
+    background-color: @colorPetrol;
     position: absolute;
     top: 0;
     left: 0;
@@ -84,8 +84,8 @@
   input[type=submit] {
     color: #fff;
     border: 2px solid #ddd;
-    border-color: #049baf;
-    background: #049baf;
+    border-color: @colorPetrol;
+    background: @colorPetrol;
     margin-top: 1.5em;
     margin-left: 12.5em;
   }
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 842da8051..efdb03e23 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -59,7 +59,7 @@
 }
 
 #menu > ul > li.active li.active a {
-  color: #049baf;
+  color: @colorPetrol;
 }
 
 #menu > ul > li.active li a:focus {
@@ -125,7 +125,7 @@
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  border-left: solid 5px #049baf;
+  border-left: solid 5px @colorPetrol;
 }
 
 /* BEGIN OF Hoverable menu */
diff --git a/public/css/icinga/selection-toolbar.less b/public/css/icinga/selection-toolbar.less
index 81170bab9..ca177ebbb 100644
--- a/public/css/icinga/selection-toolbar.less
+++ b/public/css/icinga/selection-toolbar.less
@@ -7,5 +7,5 @@ div.selection-toolbar {
 }
 
 div.selection-toolbar a {
-  color: #049baf
-}
\ No newline at end of file
+  color: @colorPetrol;
+}
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 4adceec45..2870f7c07 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -225,7 +225,6 @@ li li .badge-container {
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;
-  border-radius: 0.2em;
   background-color: @colorInvalid;
 }