diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 9e16c803b28..27f7bac5b94 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -770,6 +770,7 @@ class CommandeFournisseur extends CommonOrder if ($reshook > 0) { return $hookmanager->resPrint; } + return dolGetStatus($statusLong, $statusShort, '', $statusClass, $mode); } diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php index 1bf0333e574..136af6b273e 100644 --- a/htdocs/theme/md/btn.inc.php +++ b/htdocs/theme/md/btn.inc.php @@ -44,12 +44,20 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) { /* ============================================================================== */ -div.divButAction { +/*div.divButAction { margin-bottom: 1.4em; -} +}*/ + div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete, -div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete { +div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete, +div.tabsAction > div.divButAction > span.butAction, +div.tabsAction > div.divButAction > span.butActionDelete, +div.tabsAction > div.divButAction > span.butActionRefused, +div.tabsAction > div.divButAction > a.butAction, +div.tabsAction > div.divButAction > a.butActionDelete, +div.tabsAction > div.divButAction > a.butActionRefused { margin-bottom: 1.4em !important; + margin-right: 0px !important; } div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefused { margin-bottom: 0 !important; @@ -81,9 +89,8 @@ span.butAction, span.butActionDelete { display: inline-block; text-align: center; cursor: pointer; - /* color: #fff; */ - /* background: rgb(); */ color: #444; + /* border: 1px solid #aaa; */ /* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */ @@ -251,6 +258,7 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover text-align: center; cursor: pointer; color: #999 !important; + border: 1px solid #ccc; box-sizing: border-box; -moz-box-sizing: border-box; @@ -351,7 +359,7 @@ a.btnTitle.btnTitleSelected { } .btnTitle:hover .btnTitle-label{ - color: #ffffff; + color:var(--btncolorborderhover); } div.pagination .btnTitle:hover .btnTitle-label{ color: rgb(); diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php index 18869ccb8c6..216a5043111 100644 --- a/htdocs/theme/md/theme_vars.inc.php +++ b/htdocs/theme/md/theme_vars.inc.php @@ -79,10 +79,10 @@ $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested wit // Badges colors $badgePrimary = '#007bff'; $badgeSecondary = '#999999'; +$badgeInfo = '#17a2b8'; $badgeSuccess = '#28a745'; $badgeWarning = '#a37c0d'; // See $textWarning $badgeDanger = '#8c4446'; // See $textDanger -$badgeInfo = '#17a2b8'; $badgeDark = '#343a40'; $badgeLight = '#f8f9fa'; @@ -96,11 +96,13 @@ $colorblind_deuteranopes_badgeDanger = $badgeDanger; // currently not tested * So this badges status uses default value according to theme eldy status img * TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive .... */ -$badgeStatus0 = '#cbd3d3'; -$badgeStatus1 = '#bc9526'; -$badgeStatus2 = '#e6f0f0'; +$badgeStatus0 = '#cbd3d3'; // draft +$badgeStatus1 = '#bc9526'; // validated +$badgeStatus1b = '#bc9526'; // validated +$badgeStatus2 = '#e6f0f0'; // approved $badgeStatus3 = '#bca52b'; -$badgeStatus4 = '#25a580'; +$badgeStatus4 = '#25a580'; // Color ok +$badgeStatus4b = '#25a580'; // Color ok $badgeStatus5 = '#cad2d2'; $badgeStatus6 = '#cad2d2'; $badgeStatus7 = '#277d1e';