From 9e94be8baca77ca18ace1ce6e55c2a974ecd77af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Dec 2019 20:31:09 +0100
Subject: [PATCH] CSS

---
 htdocs/core/lib/functions.lib.php    | 2 +-
 htdocs/theme/eldy/badges.inc.php     | 6 ++++--
 htdocs/theme/eldy/theme_vars.inc.php | 2 +-
 htdocs/theme/md/badges.inc.php       | 6 ++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 4e7b1b221c2..f41f8f976c1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3099,7 +3099,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
 			}
 			elseif ($pictowithouttext == 'switch_on') {
-				$facolor = '#227722';
+				$morecss = 'font-status4';
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
 			}
 			elseif ($pictowithouttext == 'off') {
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index 75dcde0c2e4..28702bacb66 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -221,14 +221,16 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 		print $cssPrefix . ".badge-status" . $statusName . " {\n";
 		print "        color: " . $thisBadgeTextColor . " !important;\n";
-
 		if (in_array($statusName, $TBadgeBorderOnly)) {
 			print "        border-color: " . $thisBadgeBorderColor . ";\n";
 		}
-
 		print "        background-color: " . $thisBadgeBackgroundColor . ";\n";
 		print "}\n";
 
+		print $cssPrefix . ".font-status" . $statusName . " {\n";
+		print "        color: " . $thisBadgeBackgroundColor . " !important;\n";
+		print "}\n";
+
 		print $cssPrefix . ".badge-status" . $statusName . ".focus, " . $cssPrefix . ".badge-status" . $statusName . ":focus {\n";
 		print "    outline: 0;\n";
 		print "    box-shadow: 0 0 0 0.2rem " . colorHexToRgb($thisBadgeBackgroundColor, 0.5) . ";\n";
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 5f7c8f60233..69e95498cee 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -108,7 +108,7 @@ $badgeStatus0 = '#cbd3d3';
 $badgeStatus1 = '#bc9526';
 $badgeStatus2 = '#e6f0f0';
 $badgeStatus3 = '#bca52b';
-$badgeStatus4 = '#55a590';
+$badgeStatus4 = '#55a580';
 $badgeStatus5 = '#cad2d2';
 $badgeStatus6 = '#cad2d2';
 $badgeStatus7 = '#baa32b';
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index 9f53a631ee4..aa067c74365 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -210,14 +210,16 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 		print $cssPrefix . ".badge-status" . $statusName . " {\n";
 		print "        color: " . $thisBadgeTextColor . " !important;\n";
-
 		if (in_array($statusName, $TBadgeBorderOnly)) {
 			print "        border-color: " . $thisBadgeBorderColor . ";\n";
 		}
-
 		print "        background-color: " . $thisBadgeBackgroundColor . ";\n";
 		print "}\n";
 
+		print $cssPrefix . ".font-status" . $statusName . " {\n";
+		print "        color: " . $thisBadgeBackgroundColor . " !important;\n";
+		print "}\n";
+
 		print $cssPrefix . ".badge-status" . $statusName . ".focus, " . $cssPrefix . ".badge-status" . $statusName . ":focus {\n";
 		print "    outline: 0;\n";
 		print "    box-shadow: 0 0 0 0.2rem " . colorHexToRgb($thisBadgeBackgroundColor, 0.5) . ";\n";