diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4ccad75628f..e96a7121f09 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -12315,7 +12315,7 @@ class Form $ret .= ''; $ret .= "\n"; - $ret .= ''; + $ret .= ''; $ret .= ''; $ret .= ''; diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php index 2a29ea2082c..084caf97c0c 100644 --- a/htdocs/core/customreports.php +++ b/htdocs/core/customreports.php @@ -633,7 +633,8 @@ if (!defined('MAIN_CUSTOM_REPORT_KEEP_GRAPH_ONLY')) { foreach ($newarrayoftype as $tmpkey => $tmpval) { - $newarrayoftype[$tmpkey]['label'] = img_picto('', $tmpval['picto'], 'class="pictofixedwidth"').$langs->trans($tmpval['label']); + $newarrayoftype[$tmpkey]['data-html'] = img_picto('', $tmpval['picto'], 'class="pictofixedwidth"').$langs->trans($tmpval['label']); + $newarrayoftype[$tmpkey]['label'] = $langs->trans($tmpval['label']); } print '
'; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index e3d2f1aba7e..b010c0555f1 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -389,19 +389,18 @@ span.massactionselect, input.inputsearch_dropdownselectedfields { border: none; border: solid 1px var(); } + .divadvancedsearchfieldcompinput, div.tabBar input, div.tabBar input.flat, div.tabBar textarea, div.tabBar textarea.flat, div.tabBar form.flat select, div.tabBar select, div.tabBar select.flat, div.tabBar .dataTables_length label select { border: solid 1px var(--inputbordercolor); - + background-color: #f8f8fa; border-bottom-left-radius: 0; border-bottom-right-radius: 0; - + } + .divadvancedsearchfieldcompinput { background: #fff; border-bottom: solid 1px var(--inputbordercolor);