responsive

Dolibarr · Nov 29, 2018 · 10fc014 · 10fc014
1 parent c5bd119
commit 10fc014
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
@@ -91,7 +91,7 @@ function report_header($reportname,$notused,$period,$periodlink,$description,$bu
 	print '<td>'.$langs->trans("ReportPeriod").'</td>';
 	print '<td>';
 	if ($period) print $period;
-	if ($variante) print '<td>'.$periodlink.'</td>';
+	if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';
 	print '</td>';
 	print '</tr>';
 

diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
@@ -97,7 +97,7 @@ function __construct($db)
 		// This is to declare the Top Menu entry:
 		$this->menu[$r]=array(	    'fk_menu'=>0,			// Put 0 if this is a top menu
 									'type'=>'top',			// This is a Top menu entry
-									'titre'=>'CashDeskMenu',
+									'titre'=>'PointOfSaleShort',
 									'mainmenu'=>'cashdesk',
 									'url'=>'/cashdesk/index.php?user=__LOGIN__',
 									'langs'=>'cashdesk',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.

diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
@@ -226,7 +226,7 @@ public function __construct($db)
 		/* BEGIN MODULEBUILDER TOPMENU */
 		$this->menu[$r++]=array('fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 								'type'=>'top',			                // This is a Top menu entry
-								'titre'=>'PointOfSale',
+								'titre'=>'PointOfSaleShort',
 								'mainmenu'=>'takepos',
 								'leftmenu'=>'',
 								'url'=>'/takepos/takepos.php',

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
@@ -33,6 +33,7 @@ FilterRefOrLabelOrBC=Search (Ref/Label)
 UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
 DolibarrReceiptPrinter=Dolibarr Receipt Printer
 PointOfSale=Point of sales
+PointOfSaleShort=POS
 CloseBill=Close Bill
 Floors=Floors
 Floor=Floor

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
@@ -45,8 +45,8 @@
 $colorbacktabactive='234,234,234';
 $colorbacklineimpair1='255,255,255';    // line impair
 $colorbacklineimpair2='255,255,255';    // line impair
-$colorbacklinepair1='245,245,245';    // line pair
-$colorbacklinepair2='245,245,245';    // line pair
+$colorbacklinepair1='250,250,250';    // line pair
+$colorbacklinepair2='250,250,250';    // line pair
 $colorbacklinepairhover='230,237,244';	// line hover
 $colorbacklinebreak='214,218,220';		// line break
 $colorbackbody='255,255,255';
@@ -512,12 +512,12 @@
 	text-align: center;
 	cursor: pointer;
 	text-decoration: none !important;
-	background-color: #f0f0f0;
-	background-image: -moz-linear-gradient(top, #f0f0f0, #e0e0e0);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f0f0f0), to(#e0e0e0));
-	background-image: -webkit-linear-gradient(top, #f0f0f0, #e0e0e0);
-	background-image: -o-linear-gradient(top, #f0f0f0, #e0e0e0);
-	background-image: linear-gradient(to bottom, #f0f0f0, #e0e0e0);
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
 	background-repeat: repeat-x;
 	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
 	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
@@ -3260,7 +3260,7 @@
     margin-bottom: 5px;
     text-align: center;
 
-    background: #e8e8e8;
+    background: #fcfcfc;
     border: 1px solid #eee;
     /* border-left: 6px solid #ddd; */
     box-shadow: 1px 1px 8px #ddd;
@@ -3409,7 +3409,7 @@
     border-bottom-width: 0 !important;
 }
 .boxtable .fichehalfright, .boxtable .fichehalfleft {
-    min-width: 300px;
+    min-width: 275px;	/* increasing this, make chart on box not side by side on laptops */
 }
 .tdboxstats {
 	text-align: center;

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
@@ -3323,7 +3323,7 @@
     /* border-bottom-width: 0 !important; */
 }
 .boxtable .fichehalfright, .boxtable .fichehalfleft {
-    min-width: 300px;
+    min-width: 275px;
 }
 .tdboxstats {
 	text-align: center;