From 00165871bd74119ce313f29936fe097c007ef93b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 23 Jun 2018 15:10:44 +0200 Subject: [PATCH] CSS --- htdocs/core/class/commonobject.class.php | 7 ++++--- htdocs/expensereport/list.php | 4 ++-- htdocs/theme/eldy/style.css.php | 2 +- htdocs/theme/md/style.css.php | 7 +++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index f3e34486f9e..97942687fe4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1458,11 +1458,11 @@ abstract class CommonObject if ($trigkey) { // call trigger with updated object values - if (empty($this->fields) && method_exists($this, 'fetch')) + if (empty($this->fields) && method_exists($this, 'fetch')) { $result = $this->fetch($id); - } - else + } + else { $result = $this->fetchCommon($id); } @@ -6140,6 +6140,7 @@ abstract class CommonObject $labeltoshow = $langs->trans($label); $out .= ''; if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]); diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index b8f88210780..70a7f8158fc 100644 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -536,7 +536,7 @@ if ($resql) if (! empty($arrayfields['d.date_debut']['checked'])) { print ''; - print ''; + print ''; $formother->select_year($year_start,'year_start',1, $min_year, $max_year); print ''; } @@ -544,7 +544,7 @@ if ($resql) if (! empty($arrayfields['d.date_fin']['checked'])) { print ''; - print ''; + print ''; $formother->select_year($year_end,'year_end',1, $min_year, $max_year); print ''; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b68013fd40d..792ee7f02a0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -36,7 +36,7 @@ if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); // Colors -$colorbackhmenu1='80,90,120'; // topmenu +$colorbackhmenu1='60,70,100'; // topmenu $colorbackvmenu1='248,248,248'; // vmenu $colortopbordertitle1='200,200,200'; // top border of title $colorbacktitle1='220,220,223'; // title of tables,list diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 8c5f819d855..a7c102d16eb 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -872,11 +872,10 @@ div.fiche>form>div.div-table-responsive { flex: 1 1 150px; } .thumbstat, .thumbstat150 { - /* flex-grow: 1; */ - /* flex-shrink: 1; */ + flex-grow: 1; + flex-shrink: 1; /* flex-basis: 140px; */ - display: inline; - width: 100%; + min-width: 150px; justify-content: flex-start; align-self: flex-start; }