diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 7ec0096615c..015b0d7ba2d 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5250,7 +5250,7 @@ abstract class CommonObject $i = 0; - print "\n"; + print "\n"; foreach ($this->lines as $line) { //Line extrafield $line->fetch_optionals(); @@ -5271,7 +5271,7 @@ abstract class CommonObject $i++; } - print "\n"; + print "\n"; } /** diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php index 5ad2b836f1b..a4a68577a95 100644 --- a/htdocs/theme/eldy/btn.inc.php +++ b/htdocs/theme/eldy/btn.inc.php @@ -213,7 +213,7 @@ TITLE BUTTON .btnTitle, a.btnTitle { display: inline-block; - padding: 4px 4px 4px 4px; + padding: 6px; font-weight: 400; /* line-height: 1; */ text-align: center; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 1df1a1c3640..f896504af21 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4258,7 +4258,7 @@ table.nointerlines tr:not(:last-child) td { /* Experimental code to manage rounding */ -table.noborder:not(.cal_month) { +table.noborder:not(.cal_month, .paymenttable) { border-radius: px; } table.noborder.cal_month { @@ -4273,20 +4273,20 @@ table.liste { border-bottom-left-radius: px; border-bottom-right-radius: px; } -table.noborder tr.liste_titre:first-child td:first-child, -table.noborder tr.liste_titre:first-child th:first-child { +table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child td:first-child, +table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:first-child { border-top-left-radius: px; } -table.noborder tr.liste_titre:first-child td:last-child, -table.noborder tr.liste_titre:first-child th:last-child { +table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child td:last-child, +table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:last-child { border-top-right-radius: px; } -table.noborder tr:last-child td:first-child, -table.noborder tr:last-child th:first-child { +table.noborder:not(.paymenttable, .margintable) tr:last-child td:first-child, +table.noborder:not(.paymenttable, .margintable) tr:last-child th:first-child { border-bottom-left-radius: px; } -table.noborder tr:last-child td:last-child, -table.noborder tr:last-child th:last-child { +table.noborder:not(.paymenttable, .margintable) tr:last-child td:last-child, +table.noborder:not(.paymenttable, .margintable) tr:last-child th:last-child { border-bottom-right-radius: px; } @@ -4307,6 +4307,13 @@ table.liste tr:last-child th:last-child { border-bottom-right-radius: px; } +table#tablelines tr:last-of-type td:first-child, table#tablelines tr#trlinefordates, table#tablelines tr#trlinefordates td { + border-bottom-left-radius: px; +} +table#tablelines tr:last-of-type td:last-child, table#tablelines tr#trlinefordates, table#tablelines tr#trlinefordates td { + border-bottom-right-radius: px; +} + /* div.tabBar div.fichehalfright table.noborder:not(.margintable):not(.paymenttable):not(.lastrecordtable):last-of-type { @@ -4349,7 +4356,7 @@ tr.liste_titre_filter td.liste_titre { border-top-color: var(--colortopbordertitle1); border-top-style: solid; } -tr.liste_titre_create td { +tr.liste_titre_create td:not(.linecoldescription) { padding-right: 4px !important; padding-left: 4px !important; } @@ -4369,6 +4376,9 @@ table.liste tr, table.noborder tr, div.noborder form { table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.noborder tr.box_titre td { padding: 6px 10px 6px 12px; /* t r b l */ } +td.linecoldescription { + padding: 6px 10px 6px 12px !important; /* t r b l */ +} table.tableforfield td, .tagtr.table-border-row .tagtd { padding: 2px 4px 2px 10px; /* t r b l */ }