Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones

This commit is contained in:
Jonathan 2023-02-27 09:42:00 +01:00
commit 8fa88a564d
3 changed files with 15 additions and 3 deletions

View File

@ -98,6 +98,10 @@ echo '</div>';
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
const menuTypeClass = '<?php echo $menuTypeClass; ?>';
if (menuTypeClass === 'classic' && menuTypeClass !== localStorage.getItem('menuType')) {
localStorage.setItem('menuType', 'classic');
}
const tab = '<?php echo $tab_active; ?>'; const tab = '<?php echo $tab_active; ?>';
if (tab === 'management') { if (tab === 'management') {
@ -443,8 +447,12 @@ echo '</div>';
* @return (int) The position (in px). * @return (int) The position (in px).
*/ */
function menu_calculate_top(index, item_height) { function menu_calculate_top(index, item_height) {
const result = index * item_height; const height_position = index * item_height;
return 133 + result; const height_logo = $('.logo_green').outerHeight(true);
const height_tabs = $('#menu_tabs').outerHeight(true);
const padding_menu = parseInt($('.godmode').css('padding-top'));
return height_logo + height_tabs + padding_menu + height_position;
} }
}); });
</script> </script>

View File

@ -288,7 +288,7 @@ function menu_print_menu(&$menu)
$submenu_output .= '<li title="'.$sub['id'].'" id="'.str_replace(' ', '_', $sub['id']).'" class="'.$class.'">'; $submenu_output .= '<li title="'.$sub['id'].'" id="'.str_replace(' ', '_', $sub['id']).'" class="'.$class.'">';
if (isset($sub['subtype']) && $sub['subtype'] == 'nolink') { if (isset($sub['subtype']) && $sub['subtype'] == 'nolink') {
$submenu_output .= '<div class=" SubNoLink '.$sub_tree_class.'"><span class="w70p span_has_menu_text">'.$sub['text'].'</span><div class="w29p arrow_menu_down"></div></div>'; $submenu_output .= '<div class=" SubNoLink '.$sub_tree_class.'"><span class="w70p span_has_menu_text">'.$sub['text'].'</span><div class="w21p arrow_menu_down"></div></div>';
} else if (isset($sub['subtype']) && $sub['subtype'] == 'new_blank') { } else if (isset($sub['subtype']) && $sub['subtype'] == 'new_blank') {
$submenu_output .= '<a href="'.$subsec2.'" target="_blank"><div class="'.$sub_tree_class.'">'.$sub['text'].'</div></a>'; $submenu_output .= '<a href="'.$subsec2.'" target="_blank"><div class="'.$sub_tree_class.'">'.$sub['text'].'</div></a>';
} else { } else {

View File

@ -635,6 +635,10 @@ select:-internal-list-box {
width: 20%; width: 20%;
} }
.w21p {
width: 21%;
}
.w22p { .w22p {
width: 22%; width: 22%;
} }