diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 2792b6d9997..c963c74c8b6 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -507,7 +507,6 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) } // BorderTableActive - /* Disabled because not supported by md theme if ($foruserprofile) { } else { $default = $langs->trans('No'); @@ -525,7 +524,6 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false) print ''; print ''; } - */ // Background color THEME_ELDY_BACKBODY if ($foruserprofile) { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 83d656196e2..04a3c948a80 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -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); $borderwidth = 2; -$userborderontable = 1; +$userborderontable = getDolGlobalInt('THEME_ELDY_USEBORDERONTABLE');; // Case of option always editable if (!isset($conf->global->THEME_ELDY_BACKBODY)) { @@ -3676,8 +3676,10 @@ div.colorback margin-top: 5px; } .liste_titre_bydiv { - border-right: 1px solid #ccc; - border-left: 1px solid #ccc; + + border-right: 1px solid var(--colortopbordertitle1); + border-left: 1px solid var(--colortopbordertitle1); + } 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 */ @@ -3690,12 +3692,15 @@ table.liste, table.noborder, table.formdoc, div.noborder { border-top-style: solid; border-bottom-width: 1px; - border-bottom-color: #BBB; + border-bottom-color: var(--colortopbordertitle1); border-bottom-style: solid; - border-right: 1px solid #ccc; - border-left: 1px solid #ccc; - + + border-right: 1px solid var(--colortopbordertitle1); + border-left: 1px solid var(--colortopbordertitle1); + + margin: 0px 0px 20px 0px; -webkit-border-radius: 0.1em; @@ -4074,7 +4079,9 @@ tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td { /* table.nobottomiftotal tr.liste_total td { background-color: #fff; + border-bottom: 0px !important; + } */ div.liste_titre .tagtd { @@ -4087,22 +4094,23 @@ div.liste_titre { padding-bottom: 2px; /*border-right-width: 1px; - border-right-color: #BBB; + border-right-color: var(--colortopbordertitle1); border-right-style: solid; border-left-width: 1px; - border-left-color: #BBB; + border-left-color: var(--colortopbordertitle1); border-left-style: solid;*/ border-top-width: 1px; - border-top-color: #BBB; + border-top-color: var(--colortopbordertitle1); border-top-style: solid; } div.liste_titre_bydiv { + border-top-width: px; border-top-color: var(--colortopbordertitle1); border-top-style: solid; - + border-collapse: collapse; display: table; padding: 2px 0px 2px 0;