From 683ad24eceeb3b7faf2b9ca3a7a757791e2240fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Nov 2015 19:16:40 +0100 Subject: [PATCH] Take number of entry into top menu to defined the trigger to change size of top menu thumbs --- htdocs/theme/eldy/style.css.php | 23 ++++++++++++++--------- htdocs/theme/md/style.css.php | 22 ++++++++++++++-------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index c744a71c189..0ebc5c54799 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -215,7 +215,7 @@ print '*/'."\n"; if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11; -//$nb=$menumanager->showmenu('topnb'); +$nbtopmenuentries=$menumanager->showmenu('topnb'); //print $nb; ?> @@ -3871,6 +3871,17 @@ border-top-right-radius: 6px; padding: 0 4px 0 4px; } @media only screen and (max-width: 767px) +{ + .imgopensurveywizard { width:95%; height: auto; } + + #tooltip { + position: absolute; + width: px; + } + +} + +@media only screen and (max-width: px) { .mainmenuaspan { display: none; @@ -3888,13 +3899,6 @@ border-top-right-radius: 6px; div.tmenuleft { display: none; } - - .imgopensurveywizard { width:95%; height: auto; } - - #tooltip { - position: absolute; - width: px; - } } @media only screen and (max-width: 570px) { @@ -3910,7 +3914,8 @@ border-top-right-radius: 6px; } div.login_block { - top: 9px; + top: 4px; + max-width: 82px; } div.mainmenu { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 7a57713337f..d1b2a357b70 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -32,7 +32,7 @@ if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1); if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); if (! defined('NOLOGIN')) define('NOLOGIN',1); // File must be accessed by logon page so without login -if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); +//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); @@ -209,6 +209,9 @@ print 'dol_screenheight='.$_SESSION['dol_screenheight']."\n"; print '*/'."\n"; if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11; + +$nbtopmenuentries=$menumanager->showmenu('topnb'); + ?> /* ============================================================================== */ @@ -3711,6 +3714,16 @@ border-top-right-radius: 6px; padding: 0 4px 0 4px; } @media only screen and (max-width: 767px) +{ + .imgopensurveywizard { width:95%; height: auto; } + + #tooltip { + position: absolute; + width: px; + } +} + +@media only screen and (max-width: px) { .mainmenuaspan { display: none; @@ -3728,13 +3741,6 @@ border-top-right-radius: 6px; div.tmenuleft { display: none; } - - .imgopensurveywizard { width:95%; height: auto; } - - #tooltip { - position: absolute; - width: px; - } } @media only screen and (max-width: 570px) {