Fix not visible menu title

This commit is contained in:
Laurent Destailleur 2016-03-12 18:22:44 +01:00
parent 7a5353efb2
commit 58988e4ad2
2 changed files with 189 additions and 26 deletions

View File

@ -209,6 +209,8 @@ print '$colortexttitlenotab='.$colortexttitlenotab."\n";
print '$colortexttitle='.$colortexttitle."\n"; print '$colortexttitle='.$colortexttitle."\n";
print '$colortext='.$colortext."\n"; print '$colortext='.$colortext."\n";
print '$colortextlink='.$colortextlink."\n"; print '$colortextlink='.$colortextlink."\n";
print '$colortextbackhmenu='.$colortextbackhmenu."\n";
print '$colortextbackvmenu='.$colortextbackvmenu."\n";
print 'dol_hide_topmenu='.$dol_hide_topmenu."\n"; print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n"; print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n"; print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
@ -284,15 +286,24 @@ input.removedassigned {
vertical-align: text-bottom; vertical-align: text-bottom;
margin-bottom: -3px; margin-bottom: -3px;
} }
input.smallpadd { input.smallpadd { /* Used for timesheet input */
padding-left: 0px !important; padding-left: 0px !important;
padding-right: 0px !important; padding-right: 0px !important;
} }
span.timesheetalreadyrecorded input {
/*font-size: smaller;*/
border: none;
/*background: transparent;*/
}
<?php } ?> <?php } ?>
select.flat, form.flat select { select.flat, form.flat select {
font-weight: normal; font-weight: normal;
} }
.optiongrey {
opacity: 0.5;
}
select:invalid { color: gray; }
input:disabled { input:disabled {
background:#ddd; background:#ddd;
} }
@ -509,6 +520,23 @@ div.myavailability {
padding-top: 4px; padding-top: 4px;
padding-bottom: 4px; padding-bottom: 4px;
} }
.checkallactions {
vertical-align: top;
margin-top: 6px;
margin-left: 4px;
}
.selectlimit {
margin-right: 10px !important;
}
.strikefordisabled {
text-decoration: line-through;
}
.tdoverflow {
max-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* ============================================================================== */ /* ============================================================================== */
@ -593,7 +621,6 @@ div.fiche {
margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'6')); ?>px; margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'6')); ?>px;
<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> <?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
} }
div.fichecenter { div.fichecenter {
width: 100%; width: 100%;
clear: both; /* This is to have div fichecenter that are true rectangles */ clear: both; /* This is to have div fichecenter that are true rectangles */
@ -1184,6 +1211,8 @@ div.vmenu, td.vmenu {
.menu_contenu { .menu_contenu {
padding-top: 5px; padding-top: 5px;
padding-bottom: 2px; padding-bottom: 2px;
overflow: hidden;
text-overflow: ellipsis;
} }
#menu_contenu_logo { padding-right: 4px; } #menu_contenu_logo { padding-right: 4px; }
.companylogo { } .companylogo { }
@ -1195,7 +1224,7 @@ a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; } a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; } font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; } a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; } font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; } a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
@ -2546,12 +2575,23 @@ div.tabBar .noborder {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
<?php } ?> <?php } ?>
} }
span.boxstatstext {
opacity: 0.8;
line-height: 18px;
}
span.boxstatsindicator { span.boxstatsindicator {
font-size: 110%; font-size: 110%;
font-weight: bold; font-weight: normal;
} }
span.dashboardlineindicator, span.dashboardlineindicatorlate { span.dashboardlineindicator, span.dashboardlineindicatorlate {
font-size: 120%; font-size: 120%;
font-weight: normal;
}
span.dashboardlineok {
color: #008800;
}
span.dashboardlineko {
color: #880000;
font-weight: bold; font-weight: bold;
} }
.boxtable { .boxtable {
@ -3950,6 +3990,12 @@ border-top-right-radius: 6px;
/* For demo pages */
img.demothumb {
box-shadow: 2px 2px 8px #888;
}
/* The theme for public pages */ /* The theme for public pages */
.public_body { .public_body {
margin: 20px; margin: 20px;
@ -3960,6 +4006,9 @@ border-top-right-radius: 6px;
/* CSS style used for small screen */ /* CSS style used for small screen */
.imgopensurveywizard .imgopensurveywizard
@ -3977,25 +4026,53 @@ border-top-right-radius: 6px;
} }
@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 10; ?>px) /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
/* rule to reduce top menu - 1st reduction */
@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.7, 0) + 8; ?>px)
{ {
div.tmenucenter {
max-width: <?php echo round($fontsize * 4); ?>px; /* size of viewport */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #<?php echo $colortextbackhmenu; ?>;
}
.mainmenuaspan { .mainmenuaspan {
display: none; /*display: none;*/
font-size: 10px;
} }
.topmenuimage {
background-size: 26px auto;
margin-top: 0px;
}
li.tmenu, li.tmenusel { li.tmenu, li.tmenusel {
min-width: 32px; min-width: 32px;
} }
div.mainmenu { div.mainmenu {
min-width: auto; min-width: auto;
} }
.topmenuimage {
background-size: 26px auto;
margin-top: 8px;
}
div.tmenuleft { div.tmenuleft {
display: none; display: none;
} }
} }
/* rule to reduce top menu - 2nd reduction */
@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 4.5, 0) + 8; ?>px)
{
div.tmenucenter {
max-width: <?php echo round($fontsize * 2); ?>px; /* size of viewport */
text-overflow: clip;
}
.mainmenuaspan {
/*display: none;*/
font-size: 10px;
}
.topmenuimage {
background-size: 20px auto;
margin-top: 2px;
}
}
/* rule to reduce top menu - 3rd reduction */
@media only screen and (max-width: 570px) @media only screen and (max-width: 570px)
{ {
/* Reduce login top right info */ /* Reduce login top right info */
@ -4013,13 +4090,20 @@ border-top-right-radius: 6px;
top: 4px; top: 4px;
max-width: 82px; max-width: 82px;
} }
li.tmenu, li.tmenusel {
min-width: 30px;
}
div.tmenucenter {
text-overflow: clip;
}
.topmenuimage {
background-size: 20px auto;
margin-top: 2px !important;
}
div.mainmenu { div.mainmenu {
min-width: 20px; min-width: 20px;
} }
.topmenuimage {
background-size: 20px auto;
}
#tooltip { #tooltip {
position: absolute; position: absolute;

View File

@ -204,6 +204,8 @@ print '$colortexttitlenotab='.$colortexttitlenotab."\n";
print '$colortexttitle='.$colortexttitle."\n"; print '$colortexttitle='.$colortexttitle."\n";
print '$colortext='.$colortext."\n"; print '$colortext='.$colortext."\n";
print '$colortextlink='.$colortextlink."\n"; print '$colortextlink='.$colortextlink."\n";
print '$colortextbackhmenu='.$colortextbackhmenu."\n";
print '$colortextbackvmenu='.$colortextbackvmenu."\n";
print 'dol_hide_topmenu='.$dol_hide_topmenu."\n"; print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n"; print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n"; print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
@ -506,6 +508,24 @@ div.myavailability {
padding-top: 4px; padding-top: 4px;
padding-bottom: 4px; padding-bottom: 4px;
} }
.checkallactions {
vertical-align: top;
margin-top: 6px;
margin-left: 4px;
}
.selectlimit {
margin-right: 10px !important;
}
.strikefordisabled {
text-decoration: line-through;
}
.tdoverflow {
max-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* ============================================================================== */ /* ============================================================================== */
/* Styles to hide objects */ /* Styles to hide objects */
@ -644,7 +664,6 @@ div.fiche {
<?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> <?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?>
margin-bottom: 15px; margin-bottom: 15px;
} }
div.fichecenter { div.fichecenter {
width: 100%; width: 100%;
clear: both; /* This is to have div fichecenter that are true rectangles */ clear: both; /* This is to have div fichecenter that are true rectangles */
@ -827,13 +846,14 @@ ul.tmenu { /* t r b l */
} }
ul.tmenu li { ul.tmenu li {
background: rgb(<?php echo $colorbackhmenu1 ?>); background: rgb(<?php echo $colorbackhmenu1 ?>);
/*
background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
*/
} }
li.tmenu, li.tmenusel { li.tmenu, li.tmenusel {
<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?> <?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
@ -1229,7 +1249,12 @@ div.vmenu, td.vmenu {
width: 202px; width: 202px;
} }
.menu_contenu { padding-top: 4px; padding-bottom: 3px;} .menu_contenu {
padding-top: 4px;
padding-bottom: 3px;
overflow: hidden;
text-overflow: ellipsis;
}
#menu_contenu_logo { padding-right: 4px; } #menu_contenu_logo { padding-right: 4px; }
.companylogo { padding-top: 4px; } .companylogo { padding-top: 4px; }
.searchform { padding-top: 8px; } .searchform { padding-top: 8px; }
@ -1240,7 +1265,7 @@ a.vmenu:link, a.vmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; }
a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; } a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; }
font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; } font.vsmenudisabled { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #aaa; }
a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; } a.vsmenu:link, a.vsmenu:visited { color: #<?php echo $colortextbackvmenu; ?>; white-space: nowrap; }
font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; } font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; }
a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; } a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print $fontsizesmaller ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: normal; color: #666666; text-decoration: none; }
@ -2378,14 +2403,25 @@ div.tabBar .noborder {
background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>; background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinepair1)); ?>;
<?php } ?> <?php } ?>
} }
span.boxstatstext {
opacity: 0.8;
line-height: 18px;
}
span.boxstatsindicator { span.boxstatsindicator {
font-size: 110%; font-size: 110%;
font-weight: bold; font-weight: normal;
} }
span.dashboardlineindicator, span.dashboardlineindicatorlate { span.dashboardlineindicator, span.dashboardlineindicatorlate {
font-size: 120%; font-size: 120%;
font-weight: bold; font-weight: bold;
} }
span.dashboardlineok {
color: #008800;
}
span.dashboardlineko {
color: #880000;
font-weight: bold;
}
.boxtable { .boxtable {
-moz-box-shadow: 3px 3px 4px #f4f4f4; -moz-box-shadow: 3px 3px 4px #f4f4f4;
@ -3785,6 +3821,13 @@ border-top-right-radius: 6px;
/* For demo pages */
img.demothumb {
box-shadow: 2px 2px 8px #888;
margin-bottom: 4px;
}
/* The theme for public pages */ /* The theme for public pages */
.public_body { .public_body {
margin: 20px; margin: 20px;
@ -3827,25 +3870,53 @@ border-top-right-radius: 6px;
} }
} }
/* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
/* rule to reduce top menu - 1st reduction */
@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 200; ?>px) @media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 200; ?>px)
{ {
div.tmenucenter {
max-width: <?php echo round($fontsize * 4); ?>px; /* size of viewport */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #<?php echo $colortextbackhmenu; ?>;
}
.mainmenuaspan { .mainmenuaspan {
display: none; /*display: none;*/
font-size: 10px;
} }
.topmenuimage {
background-size: 26px auto;
margin-top: 0px;
}
li.tmenu, li.tmenusel { li.tmenu, li.tmenusel {
min-width: 32px; min-width: 32px;
} }
div.mainmenu { div.mainmenu {
min-width: auto; min-width: auto;
} }
.topmenuimage {
background-size: 26px auto;
margin-top: 8px;
}
div.tmenuleft { div.tmenuleft {
display: none; display: none;
} }
} }
/* rule to reduce top menu - 2nd reduction */
@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 4.5, 0) + 200; ?>px)
{
div.tmenucenter {
max-width: <?php echo round($fontsize * 2); ?>px; /* size of viewport */
text-overflow: clip;
}
.mainmenuaspan {
/*display: none;*/
font-size: 10px;
}
.topmenuimage {
background-size: 20px auto;
margin-top: 2px;
}
}
/* rule to reduce top menu - 3rd reduction */
@media only screen and (max-width: 570px) @media only screen and (max-width: 570px)
{ {
/* Reduce login top right info */ /* Reduce login top right info */
@ -3863,12 +3934,20 @@ border-top-right-radius: 6px;
top: 9px; top: 9px;
} }
li.tmenu, li.tmenusel {
min-width: 30px;
}
div.tmenucenter {
text-overflow: clip;
}
.topmenuimage {
background-size: 20px auto;
margin-top: 2px !important;
}
div.mainmenu { div.mainmenu {
min-width: 20px; min-width: 20px;
} }
.topmenuimage {
background-size: 20px auto;
}
#tooltip { #tooltip {
position: absolute; position: absolute;