From e2f8d50082ba2be488ac532758c430e2cecdbbb0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 16 Jun 2024 14:58:57 +0200 Subject: [PATCH] CSS --- htdocs/comm/action/card.php | 9 +++++---- htdocs/theme/eldy/global.inc.php | 5 +++-- htdocs/theme/md/style.css.php | 8 ++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 7f3882d5874..fc06adc04b4 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1278,7 +1278,8 @@ if ($action == 'create') { print ''.$langs->trans("Label").''; // Full day - print ''.$langs->trans("Date").''; + print ''.$langs->trans("Date").''; + print ''; // Recurring event $userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 ? 1 : 0); @@ -1286,7 +1287,7 @@ if ($action == 'create') { // Repeat //print ''; print '        
'; - print img_picto($langs->trans("Recurrence"), 'recurring', 'class="paddingright2"'); + print img_picto($langs->trans("Recurrence"), 'recurring', 'style="margin-left: 6px" class="paddingright2"'); print ''; $selectedrecurrulefreq = 'no'; @@ -1378,7 +1379,7 @@ if ($action == 'create') { } if (empty($datef) && !empty($datep)) { if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || !getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT')) { - $datef = dol_time_plus_duree($datep, (!getDolGlobalString('AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS') ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h'); + $datef = dol_time_plus_duree($datep, getDolGlobalInt('AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS', 1), 'h'); } } @@ -1390,7 +1391,7 @@ if ($action == 'create') { } else { print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); } - print '     -     '; + print '     -    
'; print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel'); print ''; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 586b3f3c3fd..654757cbceb 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -322,7 +322,7 @@ input[type=submit], input[type=submit]:hover { margin-left: 5px; } input[type=checkbox], input[type=radio] { - margin: 0 3px 0 3px; + margin: 0 3px 0 1px; } .kanban input.checkforselect { margin-right: 0px; @@ -1773,6 +1773,7 @@ maxscreenheightless200 { .clearboth { clear:both; } .hideobject { display: none; } +.showonsmartphone { display: none; } .minwidth25 { min-width: 25px; } .minwidth50 { min-width: 50px; } .minwidth75 { min-width: 75px; } @@ -5159,7 +5160,7 @@ div.titre { color: var(--colortexttitlenotab2); } -table.table-fiche-title .col-title div.titre, .col-right .btnTitle-icon { +table.table-fiche-title .col-title div.titre, .col-center .btnTitle-icon, .col-right .btnTitle-icon { line-height: 40px; } table.table-fiche-title { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index fd4d3d8a653..53d60c51ea9 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -843,7 +843,7 @@ input:-webkit-autofill { } input[type=checkbox], input[type=radio] { - margin: 0 3px 0 3px; + margin: 0 3px 0 1px; } .kanban input.checkforselect { margin-right: 0px; @@ -1933,8 +1933,12 @@ tr.nobottom td { /* ============================================================================== */ /* Styles to hide objects */ /* ============================================================================== */ + .clearboth { clear:both; } + .hideobject { display: none; } +.showonsmartphone { display: none; } + .minwidth25 { min-width: 25px; } .minwidth50 { min-width: 50px; } .minwidth75 { min-width: 75px; } @@ -5149,7 +5153,7 @@ div.titre { table.centpercent.notopnoleftnoright.table-fiche-title { margin-bottom: 10px !important; } -table.table-fiche-title .col-title div.titre, .col-right .btnTitle-icon { +table.table-fiche-title .col-title div.titre, .col-center .btnTitle-icon, .col-right .btnTitle-icon { line-height: 40px; }