adjusted off canvas search and topbar search

diff --git a/css/app.css b/css/app.css
index a801486..c5f8880 100644 (file)
--- a/css/app.css
+++ b/css/app.css
@@ -6639,14 +6639,16 @@ header {
 .top-bar-section ul li:nth-child(1) ul.dropdown {
   -webkit-column-count: 1; }
 
-#searchform {
-  display: none; }
-
-#searchform .button {
-  display: none; }
-
-#lar-search {
-  height: 30px; }
+@media only screen and (min-width:64.063em) {
+  #searchform .button {
+    display: none; }
+  #searchform {
+    display: none;
+    float: right;
+    height: 30px; }
+  #lar-search {
+    height: 25px;
+    padding: 0; } }
 
 .blog-wrap {
   background: url(../assets/repeating-pattern.jpg) repeat;

diff --git a/js/app.js b/js/app.js
index 719690c..d5982d8 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -56,11 +56,10 @@ $(document).ready(function () {
 //        blocks.init();
     $("#searchIcon").click(function(){
         if($("#searchform").css("display") == "none"){
+//           $("#searchform").css("display", "inline");
             $("#searchform").toggle("slide");
             $("#searchIcon").css("visibility", "hidden");
-        } else {
-            $("#searchform").toggle("slide");
-        }
+        } 
          $("#lar-search").focus();
     });
     $("#lar-search").blur(function(){

diff --git a/js/custom/pageSetup.js b/js/custom/pageSetup.js
index b94dcc5..9e1c330 100644 (file)
--- a/js/custom/pageSetup.js
+++ b/js/custom/pageSetup.js
@@ -47,11 +47,10 @@ $(document).ready(function () {
 //        blocks.init();
     $("#searchIcon").click(function(){
         if($("#searchform").css("display") == "none"){
+//           $("#searchform").css("display", "inline");
             $("#searchform").toggle("slide");
             $("#searchIcon").css("visibility", "hidden");
-        } else {
-            $("#searchform").toggle("slide");
-        }
+        } 
          $("#lar-search").focus();
     });
     $("#lar-search").blur(function(){

diff --git a/parts/search.php b/parts/search.php
index 1408622..fddee5b 100644 (file)
--- a/parts/search.php
+++ b/parts/search.php
@@ -1,6 +1,5 @@
-<span>
+
    <form role="search" method="get" id="searchform" action="<?php echo home_url('/'); ?>">
     <input class="search-input" type="text" placeholder="Search" value="" name="s" id="lar-search">
     <input type="submit" class="button" name="submit" value="Search">
 </form>
-</span>
\ No newline at end of file

diff --git a/scss/_topbar.scss b/scss/_topbar.scss
index aa245cd..1462ce5 100644 (file)
--- a/scss/_topbar.scss
+++ b/scss/_topbar.scss
@@ -439,12 +439,17 @@
 .top-bar-section ul li:nth-child(1) ul.dropdown{
     -webkit-column-count: 1;
 }
-#searchform{
-    display: none;
-}
-#searchform .button{
-    display: none;
+@media #{$large-up}{
+    #searchform .button{
+        display: none;
+    }
+    #searchform{
+        display: none;
+        float: right;
+        height: 30px;
+    }
+    #lar-search{
+        height: 25px;
+        padding: 0;
+    }
 }
-#lar-search{
-    height: 30px;
-}
\ No newline at end of file