From 056f51bfc559678c965082d56d616d38fa7271e4 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 13 Aug 2019 07:14:42 +0200
Subject: [PATCH 1/2] FIX duplicate css tag, decrease padding-bottom for boxes
 in eldy theme

---
 htdocs/theme/eldy/global.inc.php | 10 ++++------
 htdocs/theme/md/style.css.php    |  9 +++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index a137b91236f..4df7a6ba014 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3080,6 +3080,10 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 .box {
     overflow-x: auto;
     min-height: 40px;
+    padding-right: 0px;
+    padding-left: 0px;
+    /*padding-bottom: 25px;*/
+    padding-bottom: 10px;
 }
 .ficheaddleft div.boxstats, .ficheaddright div.boxstats {
     border: none;
@@ -3266,12 +3270,6 @@ a.valignmiddle.dashboardlineindicator {
     line-height: 30px;
 }
 
-.box {
-    padding-right: 0px;
-    padding-left: 0px;
-    padding-bottom: 25px;
-}
-
 tr.box_titre {
     height: 26px;
 
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 8999a73aaea..704610eca82 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3344,6 +3344,9 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 .box {
     overflow-x: auto;
     min-height: 40px;
+    padding-right: 0px;
+    padding-left: 0px;
+    padding-bottom: 12px;
 }
 .ficheaddleft div.boxstats, .ficheaddright div.boxstats {
     border: none;
@@ -3470,12 +3473,6 @@ a.valignmiddle.dashboardlineindicator {
     line-height: 30px;
 }
 
-.box {
-    padding-right: 0px;
-    padding-left: 0px;
-    padding-bottom: 12px;
-}
-
 tr.box_titre {
     height: 26px !important;
 

From 34579dd4dbdfb80fb1789b35163a04fa35a1df8e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 13 Aug 2019 07:46:03 +0200
Subject: [PATCH 2/2] FIX phpcs

---
 htdocs/core/lib/website.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 510539f7421..b745956d3ca 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -185,7 +185,7 @@ function dolKeepOnlyPhpCode($str)
  * @return  void
  * @see	dolWebsiteReplacementOfLinks()  for function used to replace content in the backoffice context when USEDOLIBARREDITOR is not on
  */
-function dolWebsiteOutput($content, $contenttype='html')
+function dolWebsiteOutput($content, $contenttype = 'html')
 {
 	global $db, $langs, $conf, $user;
 	global $dolibarr_main_url_root, $dolibarr_main_data_root;