Fix responsive

This commit is contained in:
Laurent Destailleur 2021-12-16 23:53:05 +01:00
parent fdf7749a54
commit 3895438b85
4 changed files with 30 additions and 12 deletions

View File

@ -2347,7 +2347,7 @@ class Form
$out .= img_picto($langs->trans("Search"), 'search'); $out .= img_picto($langs->trans("Search"), 'search');
} }
} }
$out .= '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />'; $out .= '<input type="text" class="minwidth100'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
if ($hidelabel == 3) { if ($hidelabel == 3) {
$out .= img_picto($langs->trans("Search"), 'search'); $out .= img_picto($langs->trans("Search"), 'search');
} }

View File

@ -192,20 +192,20 @@ if ($result || !($id > 0)) {
// Type // Type
print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>'; print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>';
$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service')); $array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
print $form->selectarray('type', $array, $type); print $form->selectarray('type', $array, $type, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
print '</td></tr>'; print '</td></tr>';
// Product // Product
print '<tr><td class="titlefield">'.$langs->trans("ProductOrService").'</td><td>'; print '<tr><td class="titlefield">'.$langs->trans("ProductOrService").'</td><td>';
print img_picto('', 'product', 'class="pictofixedwidth"'); print img_picto('', 'product', 'class="pictofixedwidth"');
print $form->select_produits($id, 'id', '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, 'maxwidth500'); print $form->select_produits($id, 'id', '', 0, 0, 1, 2, '', ($conf->dol_optimize_smallscreen ? 1 : 0), array(), 0, '1', 0, 'widthcentpercentminusx maxwidth400');
print '</td></tr>'; print '</td></tr>';
// Tag // Tag
if ($conf->categorie->enabled) { if ($conf->categorie->enabled) {
print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>'; print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
$moreforfilter .= img_picto($langs->trans("Categories"), 'category', 'class="pictofixedwidth"'); $moreforfilter .= img_picto($langs->trans("Categories"), 'category', 'class="pictofixedwidth"');
$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1, 1, 'widthcentpercentminusx maxwidth300'); $moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1, 1, 'widthcentpercentminusx maxwidth400');
print $moreforfilter; print $moreforfilter;
print '</td></tr>'; print '</td></tr>';
} }
@ -465,7 +465,9 @@ if ($result || !($id > 0)) {
$linktoregenerate .= img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh'); $linktoregenerate .= img_picto($langs->trans("ReCalculate").' ('.$dategenerated.')', 'refresh');
$linktoregenerate .= '</a>'; $linktoregenerate .= '</a>';
// Show graph // Show graph
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
// Label // Label
print '<tr class="liste_titre"><td>'; print '<tr class="liste_titre"><td>';
@ -478,6 +480,7 @@ if ($result || !($id > 0)) {
print $graphfiles[$key]['output']; print $graphfiles[$key]['output'];
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
print '</div>';
if ($i % 2 == 0) { if ($i % 2 == 0) {
print "\n".'</div>'."\n"; print "\n".'</div>'."\n";

View File

@ -7249,6 +7249,10 @@ div.clipboardCPValue.hidewithsize {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }
.a-mesure, .a-mesure-disabled {
text-align: center;
}
} }
@media only screen and (max-width: 320px) @media only screen and (max-width: 320px)

View File

@ -688,8 +688,8 @@ input[type=checkbox], input[type=radio] {
input:-moz-placeholder { color:#ccc; } input:-moz-placeholder { color:#ccc; }
input[name=price], input[name=weight], input[name=volume], input[name=surface], input[name=sizeheight], input[name=net_measure], select[name=incoterm_id] { margin-right: 6px; } input[name=price], input[name=weight], input[name=volume], input[name=surface], input[name=sizeheight], input[name=net_measure], select[name=incoterm_id] { margin-right: 6px; }
fieldset { fieldset {
border: 1px solid #AAAAAA !important; border: 1px solid #AAAAAA !important;
padding-inline-start: 2em; padding-inline-start: 2em;
padding-inline-end: 2em; padding-inline-end: 2em;
} }
@ -2959,8 +2959,8 @@ div.vmenu, td.vmenu {
.searchform { padding-top: 10px; } .searchform { padding-top: 10px; }
.searchform .bordertransp { border: 0; } .searchform .bordertransp { border: 0; }
a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu { a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active, span.vmenu, span.vsmenu {
white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; white-space: nowrap; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold;
} }
span.vmenudisabled, font.vmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap; } span.vmenudisabled, font.vmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; color: #aaa; margin-left: 4px; white-space: nowrap; }
a.vmenu:link, a.vmenu:visited { a.vmenu:link, a.vmenu:visited {
@ -2968,8 +2968,8 @@ a.vmenu:link, a.vmenu:visited {
} }
a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; } a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
span.vsmenudisabled, font.vsmenudisabled { span.vsmenudisabled, font.vsmenudisabled {
font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa;
} }
a.vsmenu:link, a.vsmenu:visited { a.vsmenu:link, a.vsmenu:visited {
color: var(--colortextbackvmenu); color: var(--colortextbackvmenu);
@ -2978,7 +2978,7 @@ a.vsmenu:link, a.vsmenu:visited {
span.vsmenudisabledmargin, font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; } span.vsmenudisabledmargin, font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { a.help:link, a.help:visited, a.help:hover, a.help:active, span.help {
text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none; text-align: <?php print $left; ?>; font-weight: normal; color: #999; text-decoration: none;
} }
.helppresentcircle { .helppresentcircle {
@ -6997,7 +6997,7 @@ div.clipboardCPValue.hidewithsize {
border-right: 1px solid rgba(0,0,0,0.3); border-right: 1px solid rgba(0,0,0,0.3);
top: auto; top: auto;
} }
div#tmenu_tooltip { div#tmenu_tooltip {
<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?> <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
display:none; display:none;
@ -7070,6 +7070,17 @@ div.clipboardCPValue.hidewithsize {
boerder-right: unset; boerder-right: unset;
padding-left: 5px; padding-left: 5px;
} }
.a-mesure, .a-mesure-disabled {
display: block;
margin-bottom: 6px;
padding-left: 12px;
padding-right: 12px;
}
.a-mesure, .a-mesure-disabled {
text-align: center;
}
} }