From 10fc0149d84bddd9bb500944e07758a55fa4de77 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 29 Nov 2018 11:03:02 +0100 Subject: [PATCH] responsive --- htdocs/core/lib/report.lib.php | 2 +- htdocs/core/modules/modCashDesk.class.php | 2 +- htdocs/core/modules/modTakePos.class.php | 2 +- htdocs/langs/en_US/cashdesk.lang | 1 + htdocs/theme/eldy/style.css.php | 20 ++++++++++---------- htdocs/theme/md/style.css.php | 2 +- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php index 10fd7bc8919..5a8aa344240 100644 --- 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 ''.$langs->trans("ReportPeriod").''; print ''; if ($period) print $period; - if ($variante) print ''.$periodlink.''; + if ($variante) print ''.$periodlink.''; print ''; print ''; diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php index d9d4a6c2816..d9bfe6b0b5f 100644 --- a/htdocs/core/modules/modCashDesk.class.php +++ b/htdocs/core/modules/modCashDesk.class.php @@ -97,7 +97,7 @@ class modCashDesk extends DolibarrModules // 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 index 4404ee9de63..509b62101c2 100644 --- a/htdocs/core/modules/modTakePos.class.php +++ b/htdocs/core/modules/modTakePos.class.php @@ -226,7 +226,7 @@ class modTakePos extends DolibarrModules /* 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 index 7fb03ea235c..986ac02a7e9 100644 --- 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 index bd80e356560..4afac8ac2cc 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -45,8 +45,8 @@ $colorbacktabcard1='255,255,255'; // card $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 @@ hr { border: 0; border-top: 1px solid #ccc; } 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 @@ ul.noborder li:nth-child(even):not(.liste_titre) { 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 @@ table.noborder.boxtable tr td { 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 index 2e663cfdb30..8a11f80b489 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3323,7 +3323,7 @@ span.dashboardlineko { /* border-bottom-width: 0 !important; */ } .boxtable .fichehalfright, .boxtable .fichehalfleft { - min-width: 300px; + min-width: 275px; } .tdboxstats { text-align: center;