diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index 8ddd7e48a85cd1d30283f959ea24a7a6cc0df704..d20eb4c329956f82b0c628bed8f00ef03d6f96b2 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -48,7 +48,7 @@ $langs->load("cashdesk"); onfocus="javascript: this.select(); verifResultat('resultats_dhtml', this.value, <?php echo (isset($conf->global->BARCODE_USE_SEARCH_TO_SELECT) ? (int) $conf->global->BARCODE_USE_SEARCH_TO_SELECT : 1) ?>);" onBlur="javascript: document.getElementById('resultats_dhtml').innerHTML = '';"/> </td> - <td class="select_design"> + <td class="select_design maxwidthonsmartphone"> <?php /* $selected=''; $htmlname='idprod'; @@ -60,7 +60,7 @@ $langs->load("cashdesk"); */ ?> - <select id="selProduit" name="selProduit" onchange="javascript: setSource('LISTE');"> + <select id="selProduit" class="maxwidthonsmartphone" name="selProduit" onchange="javascript: setSource('LISTE');"> <?php print '<option value="0">'.$top_liste_produits.'</option>'."\n"; @@ -80,7 +80,7 @@ $langs->load("cashdesk"); $label = $tab_designations[$i]['label']; - print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],7).' - '.dol_trunc($label,35,'middle'); + print '<option '.$selected.' value="'.$tab_designations[$i]['rowid'].'">'.dol_trunc($tab_designations[$i]['ref'],16).' - '.dol_trunc($label,35,'middle'); if (! empty($conf->stock->enabled) && !empty($conf_fkentrepot) && $tab_designations[$i]['fk_product_type']==0) print ' ('.$langs->trans("CashDeskStock").': '.(empty($tab_designations[$i]['reel'])?0:$tab_designations[$i]['reel']).')'; print '</option>'."\n"; diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php index 8489f57187ea0058a75d7844901665c1db7f7e4e..27be524af3a6f69c671b6bcd2f4ec852da3e824c 100644 --- a/htdocs/holiday/list.php +++ b/htdocs/holiday/list.php @@ -296,7 +296,7 @@ print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],'','','','',$ print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],'','','','align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateDebCP"),$_SERVER["PHP_SELF"],"cp.date_debut","",'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateFinCP"),$_SERVER["PHP_SELF"],"cp.date_fin","",'','align="center"',$sortfield,$sortorder); -print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="center"',$sortfield,$sortorder); +print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cp.statut","",'','align="right"',$sortfield,$sortorder); print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch '); print "</tr>\n"; @@ -315,14 +315,14 @@ print '</td>'; // UTILISATEUR if ($user->rights->holiday->write_all) { - print '<td class="liste_titre" align="left">'; + print '<td class="liste_titre maxwidthonsmartphone" align="left">'; print $form->select_dolusers($search_employe,"search_employe",1,"",0,'','',0,32,0,'',0,'','maxwidth200'); print '</td>'; } else { //print '<td class="liste_titre"> </td>'; - print '<td class="liste_titre" align="left">'; + print '<td class="liste_titre maxwidthonsmartphone" align="left">'; print $form->select_dolusers($user->id,"search_employe",1,"",1,'','',0,32,0,'',0,'','maxwidth200'); print '</td>'; } @@ -330,7 +330,7 @@ else // APPROVER if($user->rights->holiday->write_all) { - print '<td class="liste_titre" align="left">'; + print '<td class="liste_titre maxwidthonsmartphone" align="left">'; $validator = new UserGroup($db); $excludefilter=$user->admin?'':'u.rowid <> '.$user->id; @@ -365,7 +365,7 @@ $formother->select_year($year_end,'year_end',1, $min_year, $max_year); print '</td>'; // STATUT -print '<td class="liste_titre" width="70px;" align="center">'; +print '<td class="liste_titre maxwidthonsmartphone maxwidth200" align="right">'; $holiday->selectStatutCP($search_statut); print '</td>'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d9df3205c688b82761fcca33344ccb1714fd3623..6a2a9b80e14a502f6a2097e72b223aa44057bf10 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -4334,15 +4334,17 @@ border-top-right-radius: 6px; .menu li.menu_choix1 { padding-top: 6px; padding-right: 10px; + padding-bottom: 2px; } .menu li.menu_choix2 { padding-top: 6px; padding-right: 10px; + padding-bottom: 2px; } @media only screen and (max-width: 767px) { .menu_choix1 a, .menu_choix2 a { - background-size: 30px 30px; + background-size: 36px 36px; height: 30px; padding-left: 40px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 73a02139e5a66e5949693eb3265305f3f4eec24f..ad9bda1b4ddab9ed4b3c134922be230bf9f9fab4 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -4219,7 +4219,31 @@ border-top-right-radius: 6px; .menu_choix1 a:hover,.menu_choix2 a:hover { color: #6d3f6d; } - +.menu li.menu_choix1 { + padding-top: 6px; + padding-right: 10px; + padding-bottom: 2px; +} +.menu li.menu_choix2 { + padding-top: 6px; + padding-right: 10px; + padding-bottom: 2px; +} +@media only screen and (max-width: 767px) +{ + .menu_choix1 a, .menu_choix2 a { + background-size: 36px 36px; + background-position-y: 6px; + padding-left: 40px; + } + .menu li.menu_choix1, .menu li.menu_choix2 { + padding-left: 4px; + padding-right: 0; + } + .liste_articles { + margin-right: 0 !important; + } +}