From 5819333b80fff101230dc188e53e772fc24b609f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 24 Jun 2018 11:30:44 +0200 Subject: [PATCH] Css --- htdocs/comm/card.php | 60 ++++++++++++++++++++++++++------- htdocs/theme/eldy/style.css.php | 13 ++++--- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index c27f2f4f79f..83db0e0f1d2 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -679,7 +679,8 @@ if ($object->id > 0) $num = $db->num_rows($resql); if ($num > 0) { - print ''; + print '
'; + print '
'; print ''; print '
'; @@ -712,7 +713,11 @@ if ($object->id > 0) } $db->free($resql); - if ($num > 0) print "
'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllPropals").' '.$num.'
"; + if ($num > 0) + { + print "
"; + print ''; + } } else { @@ -759,6 +764,7 @@ if ($object->id > 0) $orders2invoice = $db->num_rows($resql2); $db->free($resql2); + print '
'; print ''; print ''; @@ -793,7 +799,11 @@ if ($object->id > 0) } $db->free($resql); - if ($num >0) print "
"; + if ($num >0) + { + print ""; + print '
'; + } } else { @@ -830,7 +840,8 @@ if ($object->id > 0) $num = $db->num_rows($resql); if ($num > 0) { - print ''; + print '
'; + print '
'; print ''; print '
'; @@ -864,7 +875,10 @@ if ($object->id > 0) $db->free($resql); if ($num > 0) + { print "
'.$langs->trans("LastSendings",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllSendings").' '.$num.'
"; + print ''; + } } else { dol_print_error($db); } @@ -890,7 +904,8 @@ if ($object->id > 0) $num = $db->num_rows($resql); if ($num >0) { - print ''; + print '
'; + print '
'; print ''; print '
'; @@ -909,6 +924,7 @@ if ($object->id > 0) $contrat->ref=$objp->ref?$objp->ref:$objp->id; $contrat->ref_customer=$objp->refcus; $contrat->ref_supplier=$objp->refsup; + $contrat->fetch_lines(); print ''; print '\n"; print '\n"; print ''; - print '\n"; print ''; @@ -927,7 +942,11 @@ if ($object->id > 0) } $db->free($resql); - if ($num > 0) print "
'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).'
'; @@ -918,8 +934,7 @@ if ($object->id > 0) print ''.dol_print_date($db->jdate($objp->dc),'day')."'.dol_print_date($db->jdate($objp->dcon),'day')." '; - $contrat->fetch_lines(); + print ''; print $contrat->getLibStatut(4); print "
"; + if ($num > 0) + { + print "
"; + print ''; + } } else { @@ -955,7 +974,8 @@ if ($object->id > 0) $num = $db->num_rows($resql); if ($num > 0) { - print ''; + print '
'; + print '
'; print ''; print '
'; @@ -983,7 +1003,11 @@ if ($object->id > 0) } $db->free($resql); - if ($num > 0) print "
'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllInterventions").' '.$num.'
"; + if ($num > 0) + { + print "
"; + print ''; + } } else { @@ -1023,6 +1047,7 @@ if ($object->id > 0) $num = $db->num_rows($resql); if ($num > 0) { + print '
'; print ''; print ''; @@ -1086,7 +1111,11 @@ if ($object->id > 0) } $db->free($resql); - if ($num > 0) print "
"; + if ($num > 0) + { + print "
"; + print ''; + } } else { @@ -1123,7 +1152,8 @@ if ($object->id > 0) $num = $db->num_rows($resql); if ($num > 0) { - print ''; + print '
'; + print '
'; print ''; print '
'; @@ -1173,7 +1203,11 @@ if ($object->id > 0) } $db->free($resql); - if ($num > 0) print "
'.$langs->trans("LastCustomersBills",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllBills").' '.$num.'
"; + if ($num > 0) + { + print "
"; + print ''; + } } else { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 5b5aebfd20d..49536d340b0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2415,8 +2415,8 @@ span.butAction, span.butActionDelete { text-transform: uppercase; font-weight: bold; - margin: 0em em !important; - padding: 0.6em em; + margin: 0em em !important; + padding: 0.6em em; font-family: ; display: inline-block; text-align: center; @@ -2479,14 +2479,17 @@ a.butActionNewRefused>span.fa-plus-circle, a.butActionNewRefused>span.fa-plus-ci white-space: nowrap !important; cursor: not-allowed !important; - margin: 0em em; - padding: 0.6em em; + margin: 0em em; + padding: 0.6em em; font-family: !important; display: inline-block; text-align: center; cursor: pointer; color: #999 !important; - border: 1px solid #bbb; + border: 1px solid #ccc; + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; } .butActionNewRefused, .butActionNewRefused:link, .butActionNewRefused:visited, .butActionNewRefused:hover, .butActionNewRefused:active { text-decoration: none !important;