Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
This commit is contained in:
commit
cd295662d6
@ -526,7 +526,7 @@ if (! is_array($x_coll) || ! is_array($x_paye))
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Blank line
|
// Blank line
|
||||||
print '<tr><td colspan="'.($span+1).'"> </td></tr>';
|
print '<tr><td colspan="'.($span+2).'"> </td></tr>';
|
||||||
|
|
||||||
// Print table headers for this quadri - expenses now
|
// Print table headers for this quadri - expenses now
|
||||||
print '<tr class="liste_titre liste_titre_topborder">';
|
print '<tr class="liste_titre liste_titre_topborder">';
|
||||||
|
|||||||
@ -199,7 +199,7 @@ $minwidthtmenu=66; /* minimum width for one top menu entry */
|
|||||||
$heightmenu=48; /* height of top menu, part with image */
|
$heightmenu=48; /* height of top menu, part with image */
|
||||||
$heightmenu2=49; /* height of top menu, part with login */
|
$heightmenu2=49; /* height of top menu, part with login */
|
||||||
$disableimages = 0;
|
$disableimages = 0;
|
||||||
$maxwidthloginblock = 130;
|
$maxwidthloginblock = 180;
|
||||||
if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu=0; }
|
if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu=0; }
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user