lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20081 from bb2a/border_theme-md

Browse Source 
NEW - add param boder table for md theme
This commit is contained in:
Laurent Destailleur 2022-04-05 18:02:51 +02:00 committed by GitHub
commit e1143eb468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/usergroups.lib.php
View File

@ -507,7 +507,6 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
} }
// BorderTableActive // BorderTableActive
/* Disabled because not supported by md theme
if ($foruserprofile) { if ($foruserprofile) {
} else { } else {
$default = $langs->trans('No'); $default = $langs->trans('No');
@ -525,7 +524,6 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }
*/
// Background color THEME_ELDY_BACKBODY // Background color THEME_ELDY_BACKBODY
if ($foruserprofile) { if ($foruserprofile) {

28
htdocs/theme/md/style.css.php
View File

@ -119,7 +119,7 @@ $dol_no_mouse_hover = $conf->dol_no_mouse_hover;
$useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->THEME_ELDY_USEBOLDTITLE : 0); $useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->THEME_ELDY_USEBOLDTITLE : 0);
$borderwidth = 2; $borderwidth = 2;
$userborderontable = 1; $userborderontable = getDolGlobalInt('THEME_ELDY_USEBORDERONTABLE');;
// Case of option always editable // Case of option always editable
if (!isset($conf->global->THEME_ELDY_BACKBODY)) { if (!isset($conf->global->THEME_ELDY_BACKBODY)) {
@ -3676,8 +3676,10 @@ div.colorback
margin-top: 5px; margin-top: 5px;
} }
.liste_titre_bydiv { .liste_titre_bydiv {
border-right: 1px solid #ccc; <?php if ($userborderontable) { ?>
border-left: 1px solid #ccc; border-right: 1px solid var(--colortopbordertitle1);
border-left: 1px solid var(--colortopbordertitle1);
<?php } ?>
} }
table.liste, table.noborder, table.formdoc, div.noborder { table.liste, table.noborder, table.formdoc, div.noborder {
width: calc(100% - 2px); /* -2 to fix a bug. Without, a scroll appears due to overflow-x: auto; of div-table-responsive */ width: calc(100% - 2px); /* -2 to fix a bug. Without, a scroll appears due to overflow-x: auto; of div-table-responsive */
@ -3690,11 +3692,14 @@ table.liste, table.noborder, table.formdoc, div.noborder {
border-top-style: solid; border-top-style: solid;
border-bottom-width: 1px; border-bottom-width: 1px;
border-bottom-color: #BBB; border-bottom-color: var(--colortopbordertitle1);
border-bottom-style: solid; border-bottom-style: solid;
border-right: 1px solid #ccc; <?php
border-left: 1px solid #ccc; if ($userborderontable) { ?>
border-right: 1px solid var(--colortopbordertitle1);
border-left: 1px solid var(--colortopbordertitle1);
<?php } ?>
margin: 0px 0px 20px 0px; margin: 0px 0px 20px 0px;
@ -4074,7 +4079,9 @@ tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
/* /*
table.nobottomiftotal tr.liste_total td { table.nobottomiftotal tr.liste_total td {
background-color: #fff; background-color: #fff;
<?php if (!$userborderontable) { ?>
border-bottom: 0px !important; border-bottom: 0px !important;
<?php } ?>
} }
*/ */
div.liste_titre .tagtd { div.liste_titre .tagtd {
@ -4087,22 +4094,23 @@ div.liste_titre {
padding-bottom: 2px; padding-bottom: 2px;
/*border-right-width: 1px; /*border-right-width: 1px;
border-right-color: #BBB; border-right-color: var(--colortopbordertitle1);
border-right-style: solid; border-right-style: solid;
border-left-width: 1px; border-left-width: 1px;
border-left-color: #BBB; border-left-color: var(--colortopbordertitle1);
border-left-style: solid;*/ border-left-style: solid;*/
border-top-width: 1px; border-top-width: 1px;
border-top-color: #BBB; border-top-color: var(--colortopbordertitle1);
border-top-style: solid; border-top-style: solid;
} }
div.liste_titre_bydiv { div.liste_titre_bydiv {
<?php if ($userborderontable) { ?>
border-top-width: <?php echo $borderwidth ?>px; border-top-width: <?php echo $borderwidth ?>px;
border-top-color: var(--colortopbordertitle1); border-top-color: var(--colortopbordertitle1);
border-top-style: solid; border-top-style: solid;
<?php } ?>
border-collapse: collapse; border-collapse: collapse;
display: table; display: table;
padding: 2px 0px 2px 0; padding: 2px 0px 2px 0;