lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Laurent Destailleur 2016-09-12 02:05:09 +02:00
parent 1fbf233f95
commit dbc017ae45
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/theme/eldy/style.css.php
View File

@ -4415,11 +4415,7 @@ img.demothumb {
/* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */ /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo $fontsize ?> */
/* rule to reduce top menu - 1st reduction */ /* rule to reduce top menu - 1st reduction */
<<<<<<< HEAD
@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 20; ?>px) @media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 7, 0) + 20; ?>px)
=======
@media only screen and (max-width: <?php echo round($nbtopmenuentries * $fontsize * 6.9, 0) + 8; ?>px)
>>>>>>> branch '3.9' of git@github.com:Dolibarr/dolibarr.git
{ {
div.tmenucenter { div.tmenucenter {
max-width: <?php echo round($fontsize * 4); ?>px; /* size of viewport */ max-width: <?php echo round($fontsize * 4); ?>px; /* size of viewport */