From 8f5ec4f8943a51f7830c1b40027abb594012d386 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 31 Aug 2011 23:05:11 +0000 Subject: [PATCH] Can edit style if admin even if demo --- htdocs/main.inc.php | 6 ++---- htdocs/theme/eldy/style.css.php | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 3df25cf7117..b2897fc840d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -640,10 +640,8 @@ if (! defined('NOLOGIN')) $conf->theme=$user->conf->MAIN_THEME; $conf->css = "/theme/".$conf->theme."/style.css.php"; } - - // 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'; - + // 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'; // 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 9de61eaaa77..c8c0f9e6430 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -217,8 +217,8 @@ td.showDragHandle { /* ============================================================================== */ div.fiche { - margin-: browser->phone) || empty($conf->global->MAIN_SMARTPHONE_OPTIM))?'10':'24'; ?>px; - margin-: browser->phone)?'8':'6'; ?>px; + margin-: browser->phone)?'10':'24'; ?>px; + margin-: browser->phone)?'8':''; ?>px; } div.fichecenter { @@ -822,7 +822,7 @@ td.photo { border-radius:0px 10px 10px 0px; } .ui-layout-toggler-closed { - height: browser->phone)?'54':'2'); ?>px !important; + height: browser->phone)?'54':'1'); ?>px !important; width: browser->phone)?'7':'22'); ?>px !important; -moz-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px;