From b4c7b9b4b2e816a195a7f8cfdabdf9804933a243 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Mon, 31 Mar 2014 20:14:33 -0500
Subject: [PATCH] Offer just one header, the BS top navbar

---
 base.php                        |  7 +------
 lib/config.php                  |  1 -
 lib/nav.php                     |  2 +-
 templates/header-top-navbar.php | 21 ---------------------
 templates/header.php            | 17 +++++++++++++----
 5 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 templates/header-top-navbar.php

diff --git a/base.php b/base.php
index 17c36f8..fcf114a 100644
--- a/base.php
+++ b/base.php
@@ -9,12 +9,7 @@
 
   <?php
     do_action('get_header');
-    // Use Bootstrap's navbar if enabled in config.php
-    if (current_theme_supports('bootstrap-top-navbar')) {
-      get_template_part('templates/header-top-navbar');
-    } else {
-      get_template_part('templates/header');
-    }
+    get_template_part('templates/header');
   ?>
 
   <div class="wrap container" role="document">
diff --git a/lib/config.php b/lib/config.php
index cca0d56..1108599 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -5,7 +5,6 @@
 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-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('jquery-cdn');            // Enable to load jQuery from the Google CDN
 
diff --git a/lib/nav.php b/lib/nav.php
index dc9a4bd..186ada2 100644
--- a/lib/nav.php
+++ b/lib/nav.php
@@ -80,7 +80,7 @@ function roots_nav_menu_args($args = '') {
     $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;
   }
 
diff --git a/templates/header-top-navbar.php b/templates/header-top-navbar.php
deleted file mode 100644
index 7589fe8..0000000
--- a/templates/header-top-navbar.php
+++ /dev/null
@@ -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>
diff --git a/templates/header.php b/templates/header.php
index 3470335..7589fe8 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -1,10 +1,19 @@
-<header class="banner" role="banner">
+<header class="banner navbar navbar-default navbar-static-top" role="banner">
   <div class="container">
-    <a class="brand" href="<?php echo home_url('/') ?>"><?php bloginfo('name'); ?></a>
-    <nav class="nav-main" role="navigation">
+    <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 nav-pills'));
+          wp_nav_menu(array('theme_location' => 'primary_navigation', 'menu_class' => 'nav navbar-nav'));
         endif;
       ?>
     </nav>