From 56bb4754c28bca0bb5c780025092de802c392ade Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 15 Apr 2015 14:20:35 -0400
Subject: [PATCH] OCN fix, WooCommerce styling & main nav.

Main navigation img li was overlapping the
other li's. OCN was showing up from 1000-
1024 due to inner-wrapper being set to max
1000px. Page numeration was using Flex
which doesn't work on Safari. Related
products got some margin. Replaced footer
social bottom items with soc-bottom 'part'
wherein a check for Woo-pages is done.
---
 footer.php           | 12 +--------
 parts/soc-bottom.php | 13 ++++++++++
 scss/_structure.scss | 21 ++++++++++++----
 search.php           | 58 +++++++++++++++++++++++---------------------
 4 files changed, 61 insertions(+), 43 deletions(-)
 create mode 100644 parts/soc-bottom.php

diff --git a/footer.php b/footer.php
index 127813d..212d37a 100644
--- a/footer.php
+++ b/footer.php
@@ -1,17 +1,7 @@
             <div id="footer-address" class="text-center side-shadow">
                     <h2>Gilmore Car Museum</h2>
                     <p>6865 W Hickory Rd. Hickory Corners, MI 49060 &#8226; 269-671-5089 &#8226; <a class="link" target="_blank" href="https://maps.google.com?daddr=6865+W+Hickory+Rd+Hickory+Corners+MI+49060">Directions</a></p>
-                    <?php if (!is_woocommerce()) { ?>
-                    <div id="soc-bottom" class="social">
-                        <a target="_blank" href="http://www.facebook.com/#!/GilmoreCarMuseum"><img src="<?php bloginfo('template_url'); ?>/assets/facebook.png"></a>
-                        <a target="_blank" href="https://www.pinterest.com/GilmoreMuseum/"><img src="<?php bloginfo('template_url'); ?>/assets/pin.jpg"></a>
-                        <a target="_blank" href="https://twitter.com/GilmoreMuseum"><img src="<?php bloginfo('template_url'); ?>/assets/twitt.jpg"></a>
-                        <a target="_blank" href="http://www.flickr.com/photos/101564849@N03/"><img src="<?php bloginfo('template_url'); ?>/assets/flickr-icon.jpg"></a>
-                        <a target="_blank" href="https://www.youtube.com/watch?v=FeIWHJvRS0k"><img src="<?php bloginfo('template_url'); ?>/assets/youtube_icon.jpg"></a>
-                        <a target="_blank" href="https://plus.google.com/+gilmorecarmuseum/"><img src="<?php bloginfo('template_url'); ?>/assets/google.png"></a>
-                        <span class='st_sharethis' st_title='<?php the_title(); ?>' st_url='<?php the_permalink(); ?>'></span>
-                    </div>
-                    <?php } ?>
+                    <?php get_template_part('parts/soc-bottom');?>
             </div>
             <footer id="page-footer">
                 <div class="row">
diff --git a/parts/soc-bottom.php b/parts/soc-bottom.php
new file mode 100644
index 0000000..c22b36c
--- /dev/null
+++ b/parts/soc-bottom.php
@@ -0,0 +1,13 @@
+                    <?php if(!is_woocommerce() && !is_shop() && !is_category() && !is_cart() && !is_checkout() && !is_account_page() &&
+                    !is_page( array('product-category','cart','checkout','my-account', 'books','clothing','dvd-cd','souvenir','toys'))) { ?>
+
+                    <div id="soc-bottom" class="social">
+                        <a target="_blank" href="http://www.facebook.com/#!/GilmoreCarMuseum"><img src="<?php bloginfo('template_url'); ?>/assets/facebook.png"></a>
+                        <a target="_blank" href="https://www.pinterest.com/GilmoreMuseum/"><img src="<?php bloginfo('template_url'); ?>/assets/pin.jpg"></a>
+                        <a target="_blank" href="https://twitter.com/GilmoreMuseum"><img src="<?php bloginfo('template_url'); ?>/assets/twitt.jpg"></a>
+                        <a target="_blank" href="http://www.flickr.com/photos/101564849@N03/"><img src="<?php bloginfo('template_url'); ?>/assets/flickr-icon.jpg"></a>
+                        <a target="_blank" href="https://www.youtube.com/watch?v=FeIWHJvRS0k"><img src="<?php bloginfo('template_url'); ?>/assets/youtube_icon.jpg"></a>
+                        <a target="_blank" href="https://plus.google.com/+gilmorecarmuseum/"><img src="<?php bloginfo('template_url'); ?>/assets/google.png"></a>
+                        <span class='st_sharethis' st_title='<?php the_title(); ?>' st_url='<?php the_permalink(); ?>'></span>
+                    </div>
+                    <?php } ?>
\ No newline at end of file
diff --git a/scss/_structure.scss b/scss/_structure.scss
index 33ee6ad..ca4eca7 100644
--- a/scss/_structure.scss
+++ b/scss/_structure.scss
@@ -3,7 +3,6 @@ body {
     background-attachment: fixed;
     background-position: bottom;
 }
-.inner-wrap,
 .inner-wrap > * {
     max-width: 1000px;
     margin-left: auto;
@@ -253,7 +252,7 @@ header .row .search-top img {
                             
                             li {
                                 white-space: nowrap;
-                                background: $white;
+                                background: transparent;
                                 border-bottom-right-radius: 10px;
                                 
                                 &:not(.has-form):not(.active) {
@@ -306,6 +305,9 @@ header .row .search-top img {
         }
     }
     .left-off-canvas-menu {
+        @media (min-width: 1000px) {
+            display: none;
+        }
         .off-canvas-search {
             padding-bottom: 25px;
             padding-top: 5px;
@@ -823,7 +825,7 @@ nav.top-bar .top-bar-section > ul > li.nav-item:nth-child(-n+4) > ul {
         position: relative;
      }
      > li.nav-img {
-         z-index: 9;
+         z-index: -1;
          background-color: transparent !important;
      }
 }
@@ -850,7 +852,7 @@ nav.top-bar .top-bar-section > ul > li.drop:nth-child(n+4) > ul.dropdown {
         right: 20px;
         position: absolute;
         background-color: transparent !important;
-        z-index: 2;
+        z-index: -1;
     }
 }
 nav.top-bar .top-bar-section > ul > li.drop:nth-child(n+4) > ul.dropdown li ul {
@@ -1907,7 +1909,7 @@ nav.top-bar .top-bar-section > ul > li.drop > ul.dropdown .woocommerce {
     font-size: 15px;
     font-weight: bold;
 }
-.woocommerce .cart_item .product-quantity {
+.woocommerce-checkout-review-order-table .product-quantity {
     float: right;
 }
 .content .woocommerce .cart_item td.product-name dl.variation dd, dd p, dt {
@@ -1935,4 +1937,13 @@ nav.top-bar .top-bar-section > ul > li.drop > ul.dropdown .woocommerce {
 .variations tbody tr {
     display: block;
 }
+.page-numbers li {
+    float: left;
+}
+.related.products {
+    margin-top: 30px;
+}
+h3#ship-to-different-address {
+    font-weight: bold;
+}
 /* End WooCommerce */ 
\ No newline at end of file
diff --git a/search.php b/search.php
index 4f8c832..80fa6c1 100644
--- a/search.php
+++ b/search.php
@@ -1,38 +1,42 @@
 <?php get_header(); ?>
 <div id="content-wrapper" class='side-shadow row'>
     <div id="search_results_over">
-        <h2 class="search-result-header">Search Results for "<?php echo get_search_query(); ?>"</h2><br>
-        <?php if(have_posts()): $i = 1; while (have_posts() && $i < 6) : the_post(); ?>
-        <div class="" id="search_results_container" style="max-width:1000px;">
-            <div class="row">
-                <div class="small-12 columns">
+        <?php if (get_search_query() == "") { ?>
+            <h2 class="search-result-header">Please enter a query in the search box. </h2><br>
+        <?php } else { ?>
+            <h2 class="search-result-header">Search Results for "<?php echo get_search_query(); ?>"</h2><br>
+            <?php if(have_posts()): $i = 1; while (have_posts() && $i < 6) : the_post(); ?>
+            <div class="" id="search_results_container" style="max-width:1000px;">
+                <div class="row">
+                    <div class="small-12 columns">
 
-                    <article id="<?php the_ID()?>" <?php post_class()?>>
-                        <span>Page: </span><h5 class=""><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h5>
-                        <?php echo the_advanced_excerpt('length=30&length_type=words&no_custom=1&ellipsis=%26hellip;&exclude_tags=img,strong,b,hr,br,div;'); ?>
-                        <footer class="entry-meta small-12 medium-6 medium-push-3 center">
+                        <article id="<?php the_ID()?>" <?php post_class()?>>
+                            <span>Page: </span><h5 class=""><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h5>
+                            <?php echo the_advanced_excerpt('length=30&length_type=words&no_custom=1&ellipsis=%26hellip;&exclude_tags=img,strong,b,hr,br,div;'); ?>
+                            <footer class="entry-meta small-12 medium-6 medium-push-3 center">
 
-                            <?php $post_categories = wp_get_post_categories( get_the_ID() );
-                            $cats = array();
-                            ?>
-                        </footer>
-                    </article>
+                                <?php $post_categories = wp_get_post_categories( get_the_ID() );
+                                $cats = array();
+                                ?>
+                            </footer>
+                        </article>
+                    </div>
                 </div>
             </div>
-        </div>
-        <?php endwhile; ?>
-        <?php if ( function_exists('FoundationPress_pagination') ) { FoundationPress_pagination(); } else if ( is_paged() ) { ?>
+            <?php endwhile; ?>
+            <?php if ( function_exists('FoundationPress_pagination') ) { FoundationPress_pagination(); } else if ( is_paged() ) { ?>
 
-        <nav id="post-nav">
-            <div class="post-previous"><?php next_posts_link( __( '&larr; Older results', 'FoundationPress' ) ); ?></div>
-            <div class="post-next"><?php previous_posts_link( __( 'Newer results &rarr;', 'FoundationPress' ) ); ?></div>
-        </nav>
-        <?php } ?>
-        <?php else: ?>
-        <div id="post-404" class="noposts">
-                <p><?php _e('Sorry, no results were found.');?></p>
-        </div><!-- /#post-404 -->
-        <?php endif;?>
+            <nav id="post-nav">
+                <div class="post-previous"><?php next_posts_link( __( '&larr; Older results', 'FoundationPress' ) ); ?></div>
+                <div class="post-next"><?php previous_posts_link( __( 'Newer results &rarr;', 'FoundationPress' ) ); ?></div>
+            </nav>
+            <?php } ?>
+            <?php else: ?>
+            <div id="post-404" class="noposts">
+                    <p><?php _e('Sorry, no results were found.');?></p>
+            </div><!-- /#post-404 -->
+            <?php endif;?>
+        <?php } ?> <!-- end empty query check -->
     </div>
 </div>
 <?php get_footer(); ?>
-- 
2.17.1