dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

Browse Source
This commit is contained in:
markjcrane
2016-03-27 01:10:49 -06:00
parent 6fa0cd2e2c cdaba6dc99
commit 3356ee39ce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/template.php
+3 -2
View File
@@ -1558,6 +1558,7 @@
$menu_type = 'static-top'; $menu_type = 'static-top';
$menu_width = 'calc(100% - 40px)'; $menu_width = 'calc(100% - 40px)';
$menu_brand = true; $menu_brand = true;
$menu_corners = "style='-webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;'";
break; break;
case 'fixed': case 'fixed':
default: default:
@@ -1568,7 +1569,7 @@
} }
?> ?>
<nav class="navbar navbar-inverse navbar-<?php echo $menu_type; ?>"> <nav class="navbar navbar-inverse navbar-<?php echo $menu_type; ?>" <?php echo $menu_corners; ?>>
<div class="container-fluid" style='width: <?php echo $menu_width; ?>; padding: 0;'> <div class="container-fluid" style='width: <?php echo $menu_width; ?>; padding: 0;'>
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main_navbar" aria-expanded="false" aria-controls="navbar"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main_navbar" aria-expanded="false" aria-controls="navbar">
@@ -1695,7 +1696,7 @@
case 'static': case 'static':
echo $open_container; echo $open_container;
show_menu($menu_array, $menu_style, $menu_position); show_menu($menu_array, $menu_style, $menu_position);
$body_top_style = "style='padding-top: 10px;'"; $body_top_style = "style='padding: 0; margin-top: -5px;'";
break; break;
case 'fixed': case 'fixed':
show_menu($menu_array, $menu_style, $menu_position); show_menu($menu_array, $menu_style, $menu_position);