initial mods for bootswatch compatibility

localhost8080 · localhost8080 · commit ccff7b9804cc · 2014-06-22T00:38:59.000+01:00
diff --git a/searchform.php b/searchform.php
@@ -9,6 +9,8 @@
 ?>
 <form action="<?php echo esc_url(home_url('/')); ?>" id="search_form" class="mb">
     <div class="input-prepend">
-        <label title="search" for="s" class="add-on"><span class="fa fa-search fafw"></span></label> <input type="text" id="s" name="s" autocomplete="off" placeholder="Search"> <input type="hidden" value="the_search_text" name="action">
+        <label title="search" for="s" class="add-on"></label>
+        <input type="text" id="s" name="s" autocomplete="off" placeholder="Search" class="form-control"> 
+        <input type="hidden" value="the_search_text" name="action">
     </div>
 </form>
diff --git a/sidebar.php b/sidebar.php
@@ -5,7 +5,8 @@
  * @package multiloquent\template_parts
  */
 
-echo '<aside class="sidebar">';
+echo '<aside class="sidebar navbar-default">';
+echo '<div>';
 get_search_form();
 wp_nav_menu(array(
     'theme_location' => 'primary-menu'
@@ -20,4 +21,5 @@
 if (is_active_sidebar(5)) {
     dynamic_sidebar(5);
 }
+echo '</div>';
 echo '</aside>';
diff --git a/style.css b/style.css
@@ -89,12 +89,6 @@ html {
 
 body {
     margin: 0;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    font-weight: 300;
-    font-size: 1em;
-    line-height: 1.6;
-    color: #333333;
-    background-color: #333333;
     padding-top: 51px;
 }
 
@@ -241,11 +235,6 @@ pre:before {
     margin: 0 auto;
 }
 
-.jumbotron {
-    background: url("/wp-content/themes/multiloquent/images/jumbotron.png") no-repeat scroll 100% 100% #f8f8f8 !important;
-    color: #676767;
-}
-
 @media ( min-width : 768px) and (max-width: 979px) {
     .search-box form {
         margin: 0 0 0 28px !important;
@@ -1428,7 +1417,6 @@ body.rtl .sharing li {
 }
 
 .wrapper {
-    background: #ffffff;
     transition: margin 0.2s linear 0s;
 }
 
@@ -1477,12 +1465,11 @@ body.rtl .sharing li {
 }
 
 .sidebar .menu ul.children,.sidebar .menu ul.sub-menu {
-    background: #676767;
     margin-left: -15px;
 }
 
 .sidebar .menu ul.children ul.children,.sidebar .menu ul.sub-menu ul.sub-menu {
-    background: #898989;
+    
 }
 
 .sidebar .menu .page_item_has_children:after,.sidebar .menu .menu-item-has-children:after {

Original file line number	Diff line number	Diff line change
`@@ -89,12 +89,6 @@ html {`
`89`	`89`
`90`	`90`	`body {`
`91`	`91`	`margin: 0;`
`92`		`- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;`
`93`		`- font-weight: 300;`
`94`		`- font-size: 1em;`
`95`		`- line-height: 1.6;`
`96`		`- color: #333333;`
`97`		`- background-color: #333333;`
`98`	`92`	`padding-top: 51px;`
`99`	`93`	`}`
`100`	`94`
`@@ -241,11 +235,6 @@ pre:before {`
`241`	`235`	`margin: 0 auto;`
`242`	`236`	`}`
`243`	`237`
`244`		`-.jumbotron {`
`245`		`- background: url("/wp-content/themes/multiloquent/images/jumbotron.png") no-repeat scroll 100% 100% #f8f8f8 !important;`
`246`		`- color: #676767;`
`247`		`-}`
`248`		`-`
`249`	`238`	`@media ( min-width : 768px) and (max-width: 979px) {`
`250`	`239`	`.search-box form {`
`251`	`240`	`margin: 0 0 0 28px !important;`
`@@ -1428,7 +1417,6 @@ body.rtl .sharing li {`
`1428`	`1417`	`}`
`1429`	`1418`
`1430`	`1419`	`.wrapper {`
`1431`		`- background: #ffffff;`
`1432`	`1420`	`transition: margin 0.2s linear 0s;`
`1433`	`1421`	`}`
`1434`	`1422`
`@@ -1477,12 +1465,11 @@ body.rtl .sharing li {`
`1477`	`1465`	`}`
`1478`	`1466`
`1479`	`1467`	`.sidebar .menu ul.children,.sidebar .menu ul.sub-menu {`
`1480`		`- background: #676767;`
`1481`	`1468`	`margin-left: -15px;`
`1482`	`1469`	`}`
`1483`	`1470`
`1484`	`1471`	`.sidebar .menu ul.children ul.children,.sidebar .menu ul.sub-menu ul.sub-menu {`
`1485`		`- background: #898989;`
	`1472`	`+`
`1486`	`1473`	`}`
`1487`	`1474`
`1488`	`1475`	`.sidebar .menu .page_item_has_children:after,.sidebar .menu .menu-item-has-children:after {`