Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts: htdocs/core/lib/functions.lib.php
Dolibarr · Jul 17, 2018 · 45b298a · 45b298a
2 parents 34c2fac + cbc4a04
commit 45b298a
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
@@ -700,10 +700,17 @@
 .divsearchfieldfilter {
     text-overflow: clip;
     overflow: auto;
-    white-space: nowrap;
     padding-bottom: 5px;
     opacity: 0.6;
 }
+<?php
+// Add a nowrap on smartphone, so long list of field used for filter are overflowed with clip
+if ($conf->browser->layout == 'phone') {
+?>
+.divsearchfieldfilter {
+   	white-space: nowrap;
+}
+<?php } ?>
 div.confirmmessage {
 	padding-top: 6px;
 }