Offer just one header, the BS top navbar
This commit is contained in:
7
base.php
7
base.php
@@ -9,12 +9,7 @@
|
|||||||
|
|
||||||
<?php
|
<?php
|
||||||
do_action('get_header');
|
do_action('get_header');
|
||||||
// Use Bootstrap's navbar if enabled in config.php
|
get_template_part('templates/header');
|
||||||
if (current_theme_supports('bootstrap-top-navbar')) {
|
|
||||||
get_template_part('templates/header-top-navbar');
|
|
||||||
} else {
|
|
||||||
get_template_part('templates/header');
|
|
||||||
}
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div class="wrap container" role="document">
|
<div class="wrap container" role="document">
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
add_theme_support('soil-clean-up'); // Enable clean up from Soil
|
add_theme_support('soil-clean-up'); // Enable clean up from Soil
|
||||||
add_theme_support('soil-relative-urls'); // Enable relative URLs from Soil
|
add_theme_support('soil-relative-urls'); // Enable relative URLs from Soil
|
||||||
add_theme_support('soil-nice-search'); // Enable /?s= to /search/ redirect from Soil
|
add_theme_support('soil-nice-search'); // Enable /?s= to /search/ redirect from Soil
|
||||||
add_theme_support('bootstrap-top-navbar'); // Enable Bootstrap's top navbar
|
|
||||||
add_theme_support('bootstrap-gallery'); // Enable Bootstrap's thumbnails component on [gallery]
|
add_theme_support('bootstrap-gallery'); // Enable Bootstrap's thumbnails component on [gallery]
|
||||||
add_theme_support('jquery-cdn'); // Enable to load jQuery from the Google CDN
|
add_theme_support('jquery-cdn'); // Enable to load jQuery from the Google CDN
|
||||||
|
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ function roots_nav_menu_args($args = '') {
|
|||||||
$roots_nav_menu_args['items_wrap'] = '<ul class="%2$s">%3$s</ul>';
|
$roots_nav_menu_args['items_wrap'] = '<ul class="%2$s">%3$s</ul>';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (current_theme_supports('bootstrap-top-navbar') && !$args['depth']) {
|
if (!$args['depth']) {
|
||||||
$roots_nav_menu_args['depth'] = 2;
|
$roots_nav_menu_args['depth'] = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
<header class="banner navbar navbar-default navbar-static-top" role="banner">
|
|
||||||
<div class="container">
|
|
||||||
<div class="navbar-header">
|
|
||||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
|
||||||
<span class="sr-only">Toggle navigation</span>
|
|
||||||
<span class="icon-bar"></span>
|
|
||||||
<span class="icon-bar"></span>
|
|
||||||
<span class="icon-bar"></span>
|
|
||||||
</button>
|
|
||||||
<a class="navbar-brand" href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<nav class="collapse navbar-collapse" role="navigation">
|
|
||||||
<?php
|
|
||||||
if (has_nav_menu('primary_navigation')) :
|
|
||||||
wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav navbar-nav'));
|
|
||||||
endif;
|
|
||||||
?>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
@@ -1,10 +1,19 @@
|
|||||||
<header class="banner" role="banner">
|
<header class="banner navbar navbar-default navbar-static-top" role="banner">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<a class="brand" href="<?php echo home_url('/') ?>"><?php bloginfo('name'); ?></a>
|
<div class="navbar-header">
|
||||||
<nav class="nav-main" role="navigation">
|
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||||
|
<span class="sr-only">Toggle navigation</span>
|
||||||
|
<span class="icon-bar"></span>
|
||||||
|
<span class="icon-bar"></span>
|
||||||
|
<span class="icon-bar"></span>
|
||||||
|
</button>
|
||||||
|
<a class="navbar-brand" href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<nav class="collapse navbar-collapse" role="navigation">
|
||||||
<?php
|
<?php
|
||||||
if (has_nav_menu('primary_navigation')) :
|
if (has_nav_menu('primary_navigation')) :
|
||||||
wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav nav-pills'));
|
wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav navbar-nav'));
|
||||||
endif;
|
endif;
|
||||||
?>
|
?>
|
||||||
</nav>
|
</nav>
|
||||||
|
|||||||
Reference in New Issue
Block a user