This commit is contained in:
Laurent Destailleur 2019-12-15 20:31:09 +01:00
parent d979f6f0f4
commit 9e94be8bac
4 changed files with 10 additions and 6 deletions

View File

@ -3099,7 +3099,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext]; $fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
} }
elseif ($pictowithouttext == 'switch_on') { elseif ($pictowithouttext == 'switch_on') {
$facolor = '#227722'; $morecss = 'font-status4';
$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext]; $fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
} }
elseif ($pictowithouttext == 'off') { elseif ($pictowithouttext == 'off') {

View File

@ -221,14 +221,16 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
print $cssPrefix . ".badge-status" . $statusName . " {\n"; print $cssPrefix . ".badge-status" . $statusName . " {\n";
print " color: " . $thisBadgeTextColor . " !important;\n"; print " color: " . $thisBadgeTextColor . " !important;\n";
if (in_array($statusName, $TBadgeBorderOnly)) { if (in_array($statusName, $TBadgeBorderOnly)) {
print " border-color: " . $thisBadgeBorderColor . ";\n"; print " border-color: " . $thisBadgeBorderColor . ";\n";
} }
print " background-color: " . $thisBadgeBackgroundColor . ";\n"; print " background-color: " . $thisBadgeBackgroundColor . ";\n";
print "}\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 $cssPrefix . ".badge-status" . $statusName . ".focus, " . $cssPrefix . ".badge-status" . $statusName . ":focus {\n";
print " outline: 0;\n"; print " outline: 0;\n";
print " box-shadow: 0 0 0 0.2rem " . colorHexToRgb($thisBadgeBackgroundColor, 0.5) . ";\n"; print " box-shadow: 0 0 0 0.2rem " . colorHexToRgb($thisBadgeBackgroundColor, 0.5) . ";\n";

View File

@ -108,7 +108,7 @@ $badgeStatus0 = '#cbd3d3';
$badgeStatus1 = '#bc9526'; $badgeStatus1 = '#bc9526';
$badgeStatus2 = '#e6f0f0'; $badgeStatus2 = '#e6f0f0';
$badgeStatus3 = '#bca52b'; $badgeStatus3 = '#bca52b';
$badgeStatus4 = '#55a590'; $badgeStatus4 = '#55a580';
$badgeStatus5 = '#cad2d2'; $badgeStatus5 = '#cad2d2';
$badgeStatus6 = '#cad2d2'; $badgeStatus6 = '#cad2d2';
$badgeStatus7 = '#baa32b'; $badgeStatus7 = '#baa32b';

View File

@ -210,14 +210,16 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
print $cssPrefix . ".badge-status" . $statusName . " {\n"; print $cssPrefix . ".badge-status" . $statusName . " {\n";
print " color: " . $thisBadgeTextColor . " !important;\n"; print " color: " . $thisBadgeTextColor . " !important;\n";
if (in_array($statusName, $TBadgeBorderOnly)) { if (in_array($statusName, $TBadgeBorderOnly)) {
print " border-color: " . $thisBadgeBorderColor . ";\n"; print " border-color: " . $thisBadgeBorderColor . ";\n";
} }
print " background-color: " . $thisBadgeBackgroundColor . ";\n"; print " background-color: " . $thisBadgeBackgroundColor . ";\n";
print "}\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 $cssPrefix . ".badge-status" . $statusName . ".focus, " . $cssPrefix . ".badge-status" . $statusName . ":focus {\n";
print " outline: 0;\n"; print " outline: 0;\n";
print " box-shadow: 0 0 0 0.2rem " . colorHexToRgb($thisBadgeBackgroundColor, 0.5) . ";\n"; print " box-shadow: 0 0 0 0.2rem " . colorHexToRgb($thisBadgeBackgroundColor, 0.5) . ";\n";