monitoring: Introduce new table related CSS classes

refs #5543
Icinga · Oct 28, 2015 · 9bdf24a · 9bdf24a
1 parent 9d082c1
commit 9bdf24a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 43 deletions.
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
@@ -1,12 +1,5 @@
 /*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-// Link to unhandled services in the hosts overview
-.host-services-incidents {
-  color: @color-critical;
-  font-family: @font-family-wide;
-  font-size: @font-size-small;
-}
-
 // State summary badges
 .state-badges {
   display: inline-block;
@@ -21,13 +14,6 @@
   }
 }
 
-// State labels in tables
-.state-label {
-  font-family: @font-family-wide;
-  font-size: @font-size-small;
-  letter-spacing: 1px;
-}
-
 .hosts-summary,
 .services-summary {
   .v-center();

diff --git a/modules/monitoring/public/css/tables.less b/modules/monitoring/public/css/tables.less
@@ -3,7 +3,7 @@
 @border-left-width: 6px;
 
 .count-col {
-  width: 60px;
+  width: 4em;
 }
 
 .state-col {
@@ -18,45 +18,45 @@
 
   &.state-critical,
   &.state-down {
-    .bg-color-critical();
-    .fg-color-inverted();
+    background-color: @color-critical;
+    color: @text-color-inverted;
 
     &.handled {
-      .bg-color-default();
-      .fg-color-default();
+      background-color: inherit;
+      color: inherit;
       border-left: @border-left-width solid @color-critical-handled;
     }
   }
 
   &.state-warning {
-    .bg-color-warning();
-    .fg-color-inverted();
+    background-color: @color-warning;
+    color: @text-color-inverted;
 
     &.handled {
-      .bg-color-default();
-      .fg-color-default();
+      background-color: inherit;
+      color: inherit;
       border-left: @border-left-width solid @color-warning-handled;
     }
   }
 
   &.state-unknown {
-    .bg-color-unknown();
-    .fg-color-inverted();
+    background-color: @color-warning;
+    color: @text-color-inverted;
 
     &.handled {
-      .bg-color-default();
-      .fg-color-default();
+      background-color: inherit;
+      color: inherit;
       border-left: @border-left-width solid @color-unknown-handled;
     }
   }
 
   &.state-unreachable {
-    .bg-color-unreachable();
-    .fg-color-inverted();
+    background-color: @color-unreachable;
+    color: @text-color-inverted;
 
     &.handled {
-      .bg-color-default();
-      .fg-color-default();
+      background-color: inherit;
+      color: inherit;
       border-left: @border-left-width solid @color-unreachable-handled;
     }
   }
@@ -69,20 +69,32 @@
   width: 100px;
 }
 
-.comment-col {
-  padding-top: 0.5em;
-  vertical-align: top;
-  width: 3em;
+.host-meta, .service-meta {
+  color: @text-color-light;
+  font-size: @font-size-small;
 }
 
-.comment-content {
-  line-height: 1.5em;
-  padding-top: 0.4em;
-  padding-bottom: 0.7em;
-  max-width: 15em;
-  color: @text-color-light;
+// Link to unhandled services in the hosts overview
+.host-services-incidents {
+  color: @color-critical;
+  font-family: @font-family-wide;
+  font-size: @font-size-small;
+}
+
+.state-header {
+  .clearfix();
+}
+
+.state-icons {
+  float: right;
+}
+
+.state-label {
+  font-family: @font-family-wide;
+  font-size: @font-size-small;
+  letter-spacing: 1px;
 }
 
-.comment-header {
-  line-height: 1.8em;
+.state-meta {
+  font-size: @font-size-small;
 }