windhamdavid 9 years ago
parent
commit
09c9406f39
2 changed files with 9 additions and 10 deletions
  1. 6 7
      header.php
  2. 3 3
      style.css

+ 6 - 7
header.php

@@ -19,12 +19,6 @@
 		<nav class="navbar navbar-fixed-top" role="navigation">
 			<div class="container">
 				<div class="navbar-header">
-		            <button type="button" class="navbar-toggle collapsed" 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>
 				<div class="site-title">
 					<a href="http://davidawindham.com" title="David Windham"><img class="dw" title="David Windham" src="<?php echo get_bloginfo('template_directory');?>/img/dw.png" width="17"/></a>
 					<a href="<?php echo home_url( '/' ); ?>" class="navbar-brand navbar-right" title="David A. Windham" rel="home">David A. Windham</a>			
@@ -33,11 +27,16 @@
 			</div>		
 		</nav>
 	</header>
-		<aside class="navmenu navmenu-default navmenu-fixed-right offcanvas" role="complementary">
+		<aside class="navmenu navmenu-default navmenu-fixed-right offcanvas" role="navigation">
 			<ul class="nav bs-docs-sidenav">
 				<li><a href="bio">bio</a></li>
 				<li><a href="archive">archives</a></li>
 				<li><a href="contact">contact</a></li>
 			</ul>
+			<div class="form-group">
+				<form role="search" method="get" id="searchform" action="<?php echo home_url( '/' ); ?>">
+				<input type="text" value="" name="s" id="s" />
+				<input type="submit" id="searchsubmit" value="S" />
+			</div>
 		</aside>
 	<div class="container">

+ 3 - 3
style.css

@@ -164,8 +164,8 @@ img.dw {
   border-color: ;
   -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
           box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
-  right: 0;
-  left: auto;
+  left: 0;
+  right: auto;
 }
 
 
@@ -173,7 +173,7 @@ img.dw {
 	padding: 15px 0;
 	padding: 10px 35px 16px 0px; 
 	float: right;
-	right: 10px;
+	left: 10px;
 	top: 20px;
 	cursor: pointer;
 	position: absolute;