diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 0152f968c0c..0b6f23c3bf6 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -446,7 +446,7 @@ $nav = ''.dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." \n"; $nav .= ''.img_next($langs->trans("Next"))."\n"; $nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' '; -$nav .= ' '; +$nav .= ' '; $picto = 'clock'; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 4c5748860db..db65e797f95 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -613,6 +613,9 @@ td.onholidaymorning, td.onholidayafternoon { td.onholidayallday { background-color: #f4eede; } +td.onholidayallday:not(.weekend) input { + background-color: #f8f7f0; +} td.leftborder, td.hide0 { border-left: 1px solid #ccc; } @@ -622,6 +625,13 @@ td.leftborder, td.hide6 { td.rightborder { border-right: 1px solid #ccc; } +td.weekend { /* must be after td.onholidayallday */ + background-color: #eee; +} +td.weekend input { + background-color: #f8f8f8; +} + td.amount, span.amount, div.amount, b.amount { color: #006666;