From 93158db1bb4a628aacd838dd0ae5adbefd2ee62a Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 25 Mar 2016 15:52:53 +0100 Subject: [PATCH 1/2] FIX : add line of separation between left menu otherwise we don't show the separate between lert menu block --- htdocs/theme/eldy/style.css.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c928b54d066..fd7d4f8ae5c 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1289,10 +1289,15 @@ a.vsmenu.addbookmarkpicto { { margin: 0 0 8px 2px; } -.vmenu div.blockvmenuend, div.blockvmenusearch +.vmenu div.blockvmenusearch { padding-bottom: 5px; } +.vmenu div.blockvmenuend +{ + padding-top: 0px; + padding-bottom: 0px; +} .vmenu div.blockvmenulogo { padding-bottom: 10px; @@ -1318,8 +1323,8 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmen border-left: 1px solid #AAA; border-right: 1px solid #BBB; -/* border-bottom: 1px solid #BBB; - border-top: 1px solid #BBB; + border-bottom: 1px solid #BBB; +/* border-top: 1px solid #BBB; border-radius: 4px; -moz-border-radius: 4px; -moz-box-shadow: 3px 3px 4px #DDD; From bf2d52894aced1b3796f0fd2f36fee938545cde3 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Fri, 25 Mar 2016 16:48:45 +0100 Subject: [PATCH 2/2] correct travis too --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index a6161ba4fed..779803a31a9 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -74,7 +74,7 @@ class Form * * @param string $text Text of label or key to translate * @param string $htmlname Name of select field ('edit' prefix will be added) - * @param string $value Value to show/edit (not used in this function) + * @param string $preselected Value to show/edit (not used in this function) * @param object $object Object * @param boolean $perm Permission to allow button to edit parameter. Set it to 0 to have a not edited field. * @param string $typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'day' or 'datepicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)