Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

CSS v18

Browse Source
This commit is contained in:
Laurent Destailleur
2023-03-11 01:09:22 +01:00
parent f183f41ad3
commit cfd48c20a9
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/dolgraph.class.php
View File

@@ -1144,7 +1144,7 @@ class DolGraph
if (isset($this->type[$firstlot])) { if (isset($this->type[$firstlot])) {
$cssfordiv .= ' dolgraphchar' . $this->type[$firstlot]; $cssfordiv .= ' dolgraphchar' . $this->type[$firstlot];
} }
$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="min-height: ' . $this->height . (strpos($this->height, '%') > 0 ? '' : 'px') . '; width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . ';" class="' . $cssfordiv . ' dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"><canvas id="canvas_' . $tag . '"></canvas></div>' . "\n"; $this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="min-height: ' . $this->height . (strpos($this->height, '%') > 0 ? '' : 'px').'; max-height: ' . (strpos($this->height, '%') > 0 ? $this->height : ($this->height + 100) . 'px').'; width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . ';" class="' . $cssfordiv . ' dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"><canvas id="canvas_' . $tag . '"></canvas></div>' . "\n";
$this->stringtoshow .= '<script nonce="'.getNonce().'" id="' . $tag . '">' . "\n"; $this->stringtoshow .= '<script nonce="'.getNonce().'" id="' . $tag . '">' . "\n";
$i = $firstlot; $i = $firstlot;

4
htdocs/core/customreports.php
View File

@@ -431,7 +431,7 @@ foreach ($newarrayoftype as $tmpkey => $tmpval) {
$newarrayoftype[$tmpkey]['label'] = img_picto('', $tmpval['picto'], 'class="pictofixedwidth"').$langs->trans($tmpval['label']); $newarrayoftype[$tmpkey]['label'] = img_picto('', $tmpval['picto'], 'class="pictofixedwidth"').$langs->trans($tmpval['label']);
} }
print '<div class="liste_titre liste_titre_bydiv centpercent">'; print '<div class="liste_titre liste_titre_bydiv liste_titre_bydiv_inlineblock centpercent">';
// Select object // Select object
print '<div class="divadvancedsearchfield center floatnone">'; print '<div class="divadvancedsearchfield center floatnone">';
@@ -863,7 +863,7 @@ if ($sql) {
$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey]; $xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
} }
$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined"))); $labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->transnoentitiesnoconv("Empty") : $langs->transnoentitiesnoconv("NotDefined")));
$xarrayforallseries = array('label' => $labeltouse); $xarrayforallseries = array('label' => $labeltouse);
foreach ($search_measures as $key => $val) { foreach ($search_measures as $key => $val) {
$fieldfory = 'y_'.$key; $fieldfory = 'y_'.$key;

6
htdocs/theme/eldy/global.inc.php
View File

@@ -4261,8 +4261,12 @@ div.liste_titre_bydiv {
box-shadow: none; box-shadow: none;
/*width: calc(100% - 1px); 1px less because display is table and with 100%, it generated a right border 1px left compared to the div-table-responsive under */ /*width: calc(100% - 1px); 1px less because display is table and with 100%, it generated a right border 1px left compared to the div-table-responsive under */
width: unset; width: unset;
/* display: table; */
} }
div.liste_titre_bydiv_inlineblock {
display: inline-block;
width: 100%;
}
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr, tagtr.liste_titre tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr, tagtr.liste_titre
{ {
height: 26px !important; height: 26px !important;

9
htdocs/theme/md/style.css.php
View File

@@ -4375,8 +4375,15 @@ div.liste_titre_bydiv {
display: table; display: table;
padding: 2px 0px 2px 0; padding: 2px 0px 2px 0;
box-shadow: none; box-shadow: none;
width: calc(100% - 2px); /* -3px because the width for table class="tagtable" under this is cal(100% - 2px) so it is aligned. */ width: calc(100% - 2px); /* -2px because the width for table class="tagtable" under this is cal(100% - 2px) so it is aligned. */
} }
/*
div.liste_titre_bydiv_inlineblock {
display: inline-block;
width: 100%;
}
*/
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr, tagtr.liste_titre tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr, tagtr.liste_titre
{ {
height: 26px !important; height: 26px !important;