Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
This commit is contained in:
commit
f1ec0348ce
@ -789,10 +789,11 @@ else
|
|||||||
print '</label>';
|
print '</label>';
|
||||||
print ' ';
|
print ' ';
|
||||||
print '<label for="radioprivate">';
|
print '<label for="radioprivate">';
|
||||||
print '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>';
|
$text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>';
|
||||||
print ' ';
|
$text.=' ';
|
||||||
print $langs->trans("Individual");
|
$text.= $langs->trans("Individual");
|
||||||
print '<div class="hideonsmartphone">('.$langs->trans("ToCreateContactWithSameName").')</div>';
|
$htmltext=$langs->trans("ToCreateContactWithSameName");
|
||||||
|
print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3);
|
||||||
print '</label>';
|
print '</label>';
|
||||||
print '</div>';
|
print '</div>';
|
||||||
print "<br>\n";
|
print "<br>\n";
|
||||||
|
|||||||
@ -148,3 +148,11 @@ background: #DDDFDD;
|
|||||||
|
|
||||||
table { font-size: 12px; }
|
table { font-size: 12px; }
|
||||||
table.login { border: 1px solid #C0C0C0; background: #F0F0F0; font-size: 12px; }
|
table.login { border: 1px solid #C0C0C0; background: #F0F0F0; font-size: 12px; }
|
||||||
|
|
||||||
|
.inline-block
|
||||||
|
{
|
||||||
|
display:inline-block;
|
||||||
|
vertical-align: top;
|
||||||
|
margin: 12px;
|
||||||
|
min-width: 400px;
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user