This commit is contained in:
Laurent Destailleur 2025-11-09 19:08:46 +01:00
parent f8e9d223f9
commit 77930aaa3c
3 changed files with 27 additions and 15 deletions

View file

@ -1297,8 +1297,8 @@ if ($mode == 'marketplace') {
$url = 'https://www.dolistore.com';
// Marketplace
print '<tr class="oddeven">'."\n";
// Source Marketplace DoliStore
print '<tr class="oddeven nohover" height="100">'."\n";
print '<td class="hideonsmartphone center width150 nopaddingleftimp nopaddingrightimp"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth100" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.svg"></a></td>';
print '<td class="minwidth500imp smallonsmartphone"><span class="opacitymedium">'.$langs->trans("DoliStoreDesc").'</span><br>';
print img_picto('', 'url', 'class="pictofixedwidth"').'<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
@ -1330,8 +1330,8 @@ if ($mode == 'marketplace') {
$url = 'https://github.com/Dolibarr/dolibarr-community-modules';
// Community
print '<tr class="oddeven">'."\n";
// Source Community github
print '<tr class="oddeven nohover" height="100">'."\n";
print '<td class="hideonsmartphone center width150 nopaddingleftimp nopaddingrightimp"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth100" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg"></a></td>';
print '<td class="minwidth500imp smallonsmartphone"><span class="opacitymedium">'.$langs->trans("CommunityModulesDesc").'</span><br>';
print img_picto('', 'url', 'class="pictofixedwidth"').'<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
@ -1409,7 +1409,7 @@ if ($mode == 'marketplace') {
print '<div class="clearboth"></div>';
?>
<?php if (!empty($categories_tree)) { ?>
<div id="category-tree-left">
<div id="category-tree-left" class="paddingtop">
<ul class="tree">
<?php
print $categories_tree; ?>
@ -1616,7 +1616,7 @@ if ($mode == 'develop') {
print '<td colspan="3">'.$langs->trans("DevelopYourModuleDesc").'</td>';
print '</tr>';
print '<tr class="oddeven" height="80">'."\n";
print '<tr class="oddeven nohover" height="100">'."\n";
print '<td class="center hideonsmartphone">';
print '<div class="imgmaxheight50 logo_setup"></div>';
print '</td>';
@ -1630,7 +1630,7 @@ if ($mode == 'develop') {
print '</td>';
print '</tr>';
print '<tr class="oddeven" height="80">'."\n";
print '<tr class="oddeven nohover" height="100">'."\n";
$url = 'https://partners.dolibarr.org';
print '<td class="center hideonsmartphone">';
print'<a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png"></a>';

View file

@ -330,6 +330,9 @@ input {
font-size: unset;
box-sizing: border-box;
}
input[type="text"] {
height: 28px;
}
select.vmenusearchselectcombo {
background-color: unset;
}
@ -7388,19 +7391,20 @@ input.select2-input {
border-top: 1px solid #ccc;
border-bottom: solid 1px var(--inputbordercolor);
}
.select2-container--default .select2-selection--single
{
.select2-container--default .select2-selection--single {
outline: none;
<?php if (!getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
border-top: none;
border-left: none;
border-right: none;
border-radius: 3px;
<?php } else { ?>
border-radius: 5px;
<?php } ?>
border<?php echo getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '' : '-bottom'; ?>: solid 1px var(--inputbordercolor);
box-shadow: none !important;
border-radius: 3px;
}
<?php if (!getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
.select2-container--focus .select2-container--default .select2-selection--single {

View file

@ -644,9 +644,12 @@ span.massactionselect, input.inputsearch_dropdownselectedfields {
input {
line-height: 1.3em;
padding: 5px;
padding: 4px;
padding-left: 5px;
}
input[type="text"] {
height: 1.3em;
}
select {
padding-top: 4px;
padding-right: 4px;
@ -7229,15 +7232,20 @@ input.select2-input {
border-top: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
.select2-container--default .select2-selection--single
{
.select2-container--default .select2-selection--single {
outline: none;
<?php if (!getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
border-top: none;
border-left: none;
border-right: none;
border-bottom: solid 1px rgba(0,0,0,.2);
border-radius: 3px;
<?php } else { ?>
border-radius: 5px;
<?php } ?>
border<?php echo getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '' : '-bottom'; ?>: solid 1px var(--inputbordercolor);
box-shadow: none !important;
border-radius: 0 !important;
}
.select2-container--default.select2-container--focus .select2-selection--multiple {
border-top: none;