diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index b2897fc840d..3df25cf7117 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -640,8 +640,10 @@ if (! defined('NOLOGIN')) $conf->theme=$user->conf->MAIN_THEME; $conf->css = "/theme/".$conf->theme."/style.css.php"; } - // If theme support flip-hide left menu and we use a smartphone, we force it - if ($conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced'; + + // If theme support optim like flip-hide left menu and we use a smartphone, we force it + if (! empty($conf->global->MAIN_SMARTPHONE_OPTIM) && $conf->browser->phone && $conf->theme == 'eldy') $conf->global->MAIN_MENU_USE_JQUERY_LAYOUT='forced'; + // Set javascript option if (! GETPOST('nojs')) // If javascript was not disabled on URL { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c8c0f9e6430..39bb6bdb374 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -54,7 +54,7 @@ if (GETPOST('theme')) $conf->theme=GETPOST('theme'); // If theme was forced on $langs->load("main",0,1); $right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); -$fontsize=empty($conf->browser->phone)?'12':'14'; +$fontsize=empty($conf->browser->phone)?'12':'15'; $fontsizesmaller=empty($conf->browser->phone)?'11':'14'; $path=''; // This value may be used in future for external module to overwrite theme @@ -217,8 +217,8 @@ td.showDragHandle { /* ============================================================================== */ div.fiche { - margin-: browser->phone)?'10':'24'; ?>px; - margin-: browser->phone)?'8':''; ?>px; + margin-: browser->phone) || empty($conf->global->MAIN_SMARTPHONE_OPTIM))?'10':'24'; ?>px; + margin-: browser->phone)?'8':'6'; ?>px; } div.fichecenter { @@ -822,7 +822,7 @@ td.photo { border-radius:0px 10px 10px 0px; } .ui-layout-toggler-closed { - height: browser->phone)?'54':'1'); ?>px !important; + height: browser->phone)?'54':'2'); ?>px !important; width: browser->phone)?'7':'22'); ?>px !important; -moz-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px;