From 608499c4cd25e60cc2cd15e09f4a05316ba6ec6e Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Wed, 23 Jun 2021 12:56:13 +0200
Subject: [PATCH] Integrate light theme's `gray-lightest` using a media query

---
 modules/doc/public/css/module.less        | 2 +-
 public/css/icinga/base.less               | 3 ++-
 public/css/icinga/forms.less              | 2 +-
 public/css/icinga/main.less               | 5 +++--
 public/css/icinga/setup.less              | 2 +-
 public/css/icinga/widgets.less            | 2 +-
 public/css/themes/icinga-light-theme.less | 2 --
 7 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 public/css/themes/icinga-light-theme.less

diff --git a/modules/doc/public/css/module.less b/modules/doc/public/css/module.less
index c8c8c553c..c3e7e22b9 100644
--- a/modules/doc/public/css/module.less
+++ b/modules/doc/public/css/module.less
@@ -2,7 +2,7 @@
 
 // Mixins
 
-.gradient(@a: ~"var(--gray-lighter, @{gray-lighter})"; @b: @gray-lightest) {
+.gradient(@a: ~"var(--gray-lighter, @{gray-lighter})"; @b: ~"var(--gray-lightest, @{gray-lightest})") {
   background: extract-variable-default(@a);
   background: @a;
   background: -webkit-gradient(linear, left top, left bottom, from(extract-variable-default(@a, true)), to(extract-variable-default(@b, true)));
diff --git a/public/css/icinga/base.less b/public/css/icinga/base.less
index f86576a97..3ca87a49e 100644
--- a/public/css/icinga/base.less
+++ b/public/css/icinga/base.less
@@ -129,6 +129,7 @@
     --gray-semilight: #A9A9A9;
     --gray-light: #C9C9C9;
     --gray-lighter: #EEEEEE;
+    --gray-lightest: #F7F7F7;
   }
 }
 
@@ -203,7 +204,7 @@ h6 {
 }
 
 pre {
-  background-color: @gray-lightest;
+  .var(background-color, gray-lightest);
   font-family: @font-family-fixed;
   font-size: @font-size-small;
   padding: @vertical-padding @horizontal-padding;
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index a6bdd4cb3..7518b13a5 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -301,7 +301,7 @@ form.icinga-form .form-controls {
 
   button.noscript-apply {
     .var(color, "gray");
-    background-color: @gray-lightest;
+    .var(background-color, gray-lightest);
     .var(border-color, "gray");
     border-width: 1px;
   }
diff --git a/public/css/icinga/main.less b/public/css/icinga/main.less
index b5d6d1d3d..ed2cb3132 100644
--- a/public/css/icinga/main.less
+++ b/public/css/icinga/main.less
@@ -110,7 +110,7 @@ a:hover > .icon-cancel {
     margin-bottom: 0.25em;
 
     &:hover {
-      background-color: @gray-lightest;
+      .var(background-color, gray-lightest);
 
       > .remove-action {
         visibility: visible;
@@ -168,7 +168,8 @@ a:hover > .icon-cancel {
   }
 
   tbody tr {
-    border-bottom: 1px solid @gray-lightest;
+    border-bottom: 1px solid;
+    .var(border-bottom-color, gray-lightest);
     border-left: 5px solid transparent;
 
     &:last-child {
diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less
index f149e5047..e4e3bdafc 100644
--- a/public/css/icinga/setup.less
+++ b/public/css/icinga/setup.less
@@ -423,7 +423,7 @@ form#setup_requirements {
     padding: 0.3em;
     border: 1px solid;
     .var(border-color, gray-semilight);
-    background-color: @gray-lightest;
+    .var(background-color, gray-lightest);
 
     .header {
       height: 2.5em;
diff --git a/public/css/icinga/widgets.less b/public/css/icinga/widgets.less
index 5fddc53f5..2dcd2e797 100644
--- a/public/css/icinga/widgets.less
+++ b/public/css/icinga/widgets.less
@@ -196,7 +196,7 @@ table.multiselect tr[href] td {
     }
 
     ul.tree li.active {
-      background-color: @gray-lightest;
+      .var(background-color, gray-lightest);
     }
 
     button {
diff --git a/public/css/themes/icinga-light-theme.less b/public/css/themes/icinga-light-theme.less
deleted file mode 100644
index 040804ee1..000000000
--- a/public/css/themes/icinga-light-theme.less
+++ /dev/null
@@ -1,2 +0,0 @@
-
-@gray-lightest: #F7F7F7;