lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX resolve conflicts

Browse Source
This commit is contained in:
VESSILLER 2020-03-17 09:52:26 +01:00
parent f7cf5f8784
commit a74dca4a20
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/takepos/css/pos.css.php
View File

@ -50,7 +50,6 @@ top_httphead('text/css');
// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate'); if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
else header('Cache-Control: no-cache'); else header('Cache-Control: no-cache');
header('Cache-Control: no-cache');
require DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php'; require DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
@ -120,7 +119,7 @@ button.calcbutton2 {
width: calc(25% - 2px); width: calc(25% - 2px);
height: calc(25% - 2px); height: calc(25% - 2px);
font-weight: bold; font-weight: bold;
font-size: 10pt; font-size: 8pt;
margin: 1px; margin: 1px;
} }