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..848a86e427d 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 { @@ -228,12 +228,12 @@ div.fichecenter { div.fichethirdleft { browser->phone)) { print "float: ".$left.";\n"; } ?> browser->phone)) { print "width: 35%;\n"; } ?> - browser->phone)) { print "padding-bottom: 6px;\n"; } ?> + browser->phone)) { print "padding-bottom: 4px;\n"; } ?> } div.fichetwothirdright { browser->phone)) { print "float: ".$left.";\n"; } ?> browser->phone)) { print "width: 65%;\n"; } ?> - browser->phone)) { print "padding-bottom: 6px\n"; } ?> + browser->phone)) { print "padding-bottom: 4px\n"; } ?> } div.fichehalfleft { browser->phone)) { print "float: ".$left.";\n"; } ?> @@ -778,9 +778,6 @@ td.photo { .ui-layout-resizer-dragging-limit { /* CLONED resizer at min or max size-limit */ background: #E1A4A4; /* red */ } -.ui-layout-resizer-closed { - background-color: #DDDDDD; -} .ui-layout-resizer-closed:hover { background-color: #EEDDDD; } @@ -794,35 +791,30 @@ td.photo { } /* sliding resizer - add 'outside-border' to resizer on-hover */ /* this sample illustrates how to target specific panes and states */ -/*.ui-layout-resizer-north-sliding-hover { border-bottom-width: 1px; } +.ui-layout-resizer-north-sliding-hover { border-bottom-width: 1px; } .ui-layout-resizer-south-sliding-hover { border-top-width: 1px; } .ui-layout-resizer-west-sliding-hover { border-right-width: 1px; } .ui-layout-resizer-east-sliding-hover { border-left-width: 1px; } -*/ /* * TOGGLER-BUTTONS */ .ui-layout-toggler { - browser->phone)) { ?> border-top: 1px solid #AAA; /* match pane-border */ border-right: 1px solid #AAA; /* match pane-border */ border-bottom: 1px solid #AAA; /* match pane-border */ background-color: #DDD; top: 5px !important; - - diplay: none; - -} + } .ui-layout-toggler-open { - height: 54px !important; + height: 48px !important; width: browser->phone)?'7':'22'); ?>px !important; -moz-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px; border-radius:0px 10px 10px 0px; } .ui-layout-toggler-closed { - height: browser->phone)?'54':'2'); ?>px !important; + height: 48px !important; width: browser->phone)?'7':'22'); ?>px !important; -moz-border-radius:0px 10px 10px 0px; -webkit-border-radius:0px 10px 10px 0px;