Work on md style

This commit is contained in:
Laurent Destailleur 2015-11-20 23:45:31 +01:00
parent 735c7b7d68
commit db27e08b7d

View File

@ -80,7 +80,7 @@ $dol_use_jmobile=$conf->dol_use_jmobile;
//var_dump($user->conf->THEME_ELDY_RGB); //var_dump($user->conf->THEME_ELDY_RGB);
// Colors // Colors
$colorbackhmenu1='140,150,180'; // topmenu $colorbackhmenu1='0,0,0'; // topmenu
$colorbackvmenu1='255,255,255'; // vmenu $colorbackvmenu1='255,255,255'; // vmenu
$colorbacktitle1='230,230,230'; // title of array $colorbacktitle1='230,230,230'; // title of array
$colorbacktabcard1='255,255,255'; // card $colorbacktabcard1='255,255,255'; // card
@ -101,7 +101,7 @@ $usegradient=1;
$useboldtitle=1; $useboldtitle=1;
// Case of option always editable // Case of option always editable
if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu (140,160,185) if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#000000')); // topmenu (140,160,185)
if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185) if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP //if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
//if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links //if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links
@ -129,7 +129,6 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
} }
//var_dump($conf->global->THEME_ELDY_BACKBODY); //var_dump($conf->global->THEME_ELDY_BACKBODY);
//var_dump($user->conf->THEME_ELDY_BACKTITLE1); //var_dump($user->conf->THEME_ELDY_BACKTITLE1);
// Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
$colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1); $colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
$colorbackvmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1); $colorbackvmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
@ -715,7 +714,7 @@ $heightmenu=48; /* height of top menu, part with image */
$heightmenu2=48; /* height of top menu, ârt with login */ $heightmenu2=48; /* height of top menu, ârt with login */
$disableimages = 0; $disableimages = 0;
$maxwidthloginblock = 110; $maxwidthloginblock = 110;
if (! empty($conf->global->THEME_ELDY_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = 180; } if (! empty($conf->global->THEME_MD_DISABLE_IMAGE)) { $heightmenu = 30; $disableimages = 1; $maxwidthloginblock = 180; }
?> ?>
div#tmenu_tooltip { div#tmenu_tooltip {
@ -812,11 +811,14 @@ li.tmenu, li.tmenusel {
vertical-align: bottom; vertical-align: bottom;
<?php if (empty($conf->global->MAIN_MENU_INVERT)) { ?> <?php if (empty($conf->global->MAIN_MENU_INVERT)) { ?>
float: <?php print $left; ?>; float: <?php print $left; ?>;
<?php if (! $disableimages) { ?>
height: <?php print $heightmenu; ?>px; height: <?php print $heightmenu; ?>px;
<?php } ?> padding: 0px 0px 2px 0px;
<?php } else { ?>
padding: 0px 0px 0px 0px;
<?php } } ?>
position:relative; position:relative;
display: block; display: block;
padding: 0px 0px 2px 0px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
font-weight: normal; font-weight: normal;
} }
@ -837,13 +839,15 @@ div.tmenuleft
margin-top: 0px; margin-top: 0px;
<?php if (empty($conf->dol_optimize_smallscreen)) { ?> <?php if (empty($conf->dol_optimize_smallscreen)) { ?>
width: 5px; width: 5px;
<?php if (! $disableimages) { ?>
height: <?php print $heightmenu+4; ?>px; height: <?php print $heightmenu+4; ?>px;
<?php } ?>
/* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 -6px no-repeat; */ /* background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menutab-r.png',1); ?>) 0 -6px no-repeat; */
<?php } ?> <?php } ?>
} }
div.tmenucenter div.tmenucenter
{ {
padding-top: 2px; padding-top: <?php echo $disableimages?'10':'2'; ?>px;
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
height: <?php print $heightmenu; ?>px; height: <?php print $heightmenu; ?>px;