From c00bdca31be6add4ae099d036b8fac5e40a6779b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 15 Dec 2019 20:58:44 +0100 Subject: [PATCH] CSS Use var in theme for picto warning --- htdocs/index.php | 2 +- htdocs/theme/eldy/badges.inc.php | 4 ++-- htdocs/theme/eldy/global.inc.php | 2 +- htdocs/theme/eldy/progress.inc.php | 6 +++--- htdocs/theme/eldy/theme_vars.inc.php | 12 ++++++------ htdocs/theme/md/badges.inc.php | 2 +- htdocs/theme/md/style.css.php | 2 +- htdocs/theme/md/theme_vars.inc.php | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index ad4412ad746..3ed9eae2073 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -723,7 +723,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { $textLate = ''; if ($board->nbtodolate > 0) { - $textLate .= ' '; + $textLate .= ' '; $textLate .= ' '.$board->nbtodolate; $textLate .= ''; } diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php index 28702bacb66..8ee7d0f02ee 100644 --- a/htdocs/theme/eldy/badges.inc.php +++ b/htdocs/theme/eldy/badges.inc.php @@ -95,7 +95,7 @@ a.badge-success:focus, a.badge-success:hover { /* DANGER */ .badge-danger { color: #fff !important; - background-color: ; + background-color: ; } a.badge-danger.focus, a.badge-danger:focus { outline: 0; @@ -108,7 +108,7 @@ a.badge-danger:focus, a.badge-danger:hover { /* WARNING */ .badge-warning { - color: #212529 !important; + color: #fff !important; background-color: ; } a.badge-warning.focus, a.badge-warning:focus { diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 70e960d424a..a773c34d765 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1399,7 +1399,7 @@ div.nopadding { } .pictowarning { /* vertical-align: text-bottom; */ - color: #9f4705; + color: ; } .pictomodule { width: 14px; diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php index a211c40efb4..750db266dfd 100644 --- a/htdocs/theme/eldy/progress.inc.php +++ b/htdocs/theme/eldy/progress.inc.php @@ -147,7 +147,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> } .progress-bar-green, .progress-bar-success { - background-color: #00a65a; + background-color: ; } .progress-striped .progress-bar-green, .progress-striped .progress-bar-success { @@ -167,7 +167,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> } .progress-bar-yellow, .progress-bar-warning { - background-color: #bc9526; + background-color: ; } .progress-striped .progress-bar-yellow, .progress-striped .progress-bar-warning { @@ -177,7 +177,7 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> } .progress-bar-red, .progress-bar-danger { - background-color: #dd4b39; + background-color: ; } .progress-striped .progress-bar-red, .progress-striped .progress-bar-danger { diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php index 69e95498cee..3c544fbb4a4 100644 --- a/htdocs/theme/eldy/theme_vars.inc.php +++ b/htdocs/theme/eldy/theme_vars.inc.php @@ -80,17 +80,17 @@ $toolTipFontColor = '#333'; // text color $textSuccess = '#28a745'; $colorblind_deuteranopes_textSuccess = '#37de5d'; -$textDanger = '#dc3545'; -$textWarning = '#bc9526'; +$textWarning = '#a37c0d'; // See $badgeWarning +$textDanger = '#9f4705'; // See $badgeDanger $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color // Badges colors $badgePrimary = '#007bff'; $badgeSecondary = '#cccccc'; -$badgeSuccess = '#28a745'; -$badgeDanger = '#9f4705'; -$badgeWarning = '#ffc107'; +$badgeSuccess = '#55a580'; +$badgeWarning = '#a37c0d'; // See $textDanger bc9526 +$badgeDanger = '#9f4705'; // See $textDanger $badgeInfo = '#aaaabb'; $badgeDark = '#343a40'; $badgeLight = '#f8f9fa'; @@ -108,7 +108,7 @@ $badgeStatus0 = '#cbd3d3'; $badgeStatus1 = '#bc9526'; $badgeStatus2 = '#e6f0f0'; $badgeStatus3 = '#bca52b'; -$badgeStatus4 = '#55a580'; +$badgeStatus4 = '#55a580'; // Color ok $badgeStatus5 = '#cad2d2'; $badgeStatus6 = '#cad2d2'; $badgeStatus7 = '#baa32b'; diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php index aa067c74365..cb389dc6f11 100644 --- a/htdocs/theme/md/badges.inc.php +++ b/htdocs/theme/md/badges.inc.php @@ -108,7 +108,7 @@ a.badge-danger:focus, a.badge-danger:hover { /* WARNING */ .badge-warning { - color: #212529 !important; + color: #fff !important; background-color: ; } a.badge-warning.focus, a.badge-warning:focus { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 377f18154fd..16498e9e736 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1605,7 +1605,7 @@ div.nopadding { } .pictowarning { /* vertical-align: text-bottom; */ - color: #9f4705; + color: ; } .pictomodule { width: 14px; diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php index c67a4ad9d50..b1bafcc7717 100644 --- a/htdocs/theme/md/theme_vars.inc.php +++ b/htdocs/theme/md/theme_vars.inc.php @@ -73,16 +73,16 @@ $fontsizesmaller = '11'; // text color $textSuccess = '#28a745'; $colorblind_deuteranopes_textSuccess = '#37de5d'; -$textDanger = '#dc3545'; -$textWarning = '#f39c12'; +$textWarning = '#a37c0d'; // See $badgeWarning +$textDanger = '#8c4446'; // See $badgeDanger $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested with a color blind people so use default color // Badges colors $badgePrimary = '#007bff'; $badgeSecondary = '#999999'; $badgeSuccess = '#28a745'; -$badgeDanger = '#8c4446'; -$badgeWarning = '#ffc107'; +$badgeWarning = '#a37c0d'; // See $textWarning +$badgeDanger = '#8c4446'; // See $textDanger $badgeInfo = '#17a2b8'; $badgeDark = '#343a40'; $badgeLight = '#f8f9fa';