Fixed header dropping down due to merge issues

diff --git a/css/app.css b/css/app.css
index 490c7d0..d2aff52 100644 (file)
--- a/css/app.css
+++ b/css/app.css
@@ -6933,7 +6933,7 @@ ul#sec-nav {
   .top-bar-section ul li.active:not(.has-form) a:not(.button) {
     background: transparent !important; }
   .top-bar-section > div > ul > li a {
-    font-size: 16px;
+    font-size: 12px;
     text-transform: uppercase;
     font-family: "Montserrat", sans-serif; }
   .top-bar-section > div > ul > li:hover {
@@ -7044,6 +7044,9 @@ ul#sec-nav {
   #res-bar img {
     float: left; }
 
+.orb-drop-shadow {
+  margin-top: -240px; }
+
 img.orb-shadow {
   position: relative;
   text-align: center; }

diff --git a/header.php b/header.php
index 925634d..d6e1c71 100644 (file)
--- a/header.php
+++ b/header.php
@@ -18,24 +18,24 @@
       <div class="off-canvas-wrap" data-offcanvas>
         <div class="inner-wrap">
             <div id="page-wrapper">
-                    <header id="page-header">
+                <header id="page-header" class="opensearchserver.ignore">
 
-                        <div id="top" class="row collapse">
-                            <div class="large-4 columns show-for-large-up social">
-                                <a target="_blank" href="https://www.facebook.com/TrueNorthGolfClub/"><img alt="Facebook" src="<?php bloginfo('template_url'); ?>/assets/facebook-icon.png"></a>
-                                <?php $newsPage = get_post(5158);?>
-                                <?php if($newsPage):?>
-                                <a href="<?php echo get_page_link($newsPage->ID);?>"><img alt="Blog" src="<?php bloginfo('template_url'); ?>/assets/blog-icon.png"></a>
-                                <?php endif;?>
-                            </div>
+                    <div id="top" class="row collapse">
+                        <div class="large-4 columns show-for-large-up social">
+                            <a target="_blank" href="https://www.facebook.com/TrueNorthGolfClub/"><img alt="Facebook" src="<?php bloginfo('template_url'); ?>/assets/facebook-icon.png"></a>
+                            <?php $newsPage = get_post(5158);?>
+                            <?php if($newsPage):?>
+                            <a href="<?php echo get_page_link($newsPage->ID);?>"><img alt="Blog" src="<?php bloginfo('template_url'); ?>/assets/blog-icon.png"></a>
+                            <?php endif;?>
+                        </div>
 <!--                            <div id="logo" class="medium-8 large-4 columns show-for-medium-up text-center">
-                                <a href="<?php // bloginfo('url'); ?>"><img class="text-center" alt="True North Golf logo" src="<?php // bloginfo('template_url'); ?>/assets/logo-white.png"></a>
-                            </div>-->
-                            <div class="phone-top medium-3 columns show-for-medium-up">
-                                <a href="tel:231-526-3300" class="phone"><span class="icon zmdi zmdi-phone"></span><span class="text">231-526-3300</span></a>
-                            </div>
+                            <a href="<?php // bloginfo('url'); ?>"><img class="text-center" alt="True North Golf logo" src="<?php // bloginfo('template_url'); ?>/assets/logo-white.png"></a>
+                        </div>-->
+                        <div class="phone-top medium-3 columns show-for-medium-up">
+                            <a href="tel:231-526-3300" class="phone"><span class="icon zmdi zmdi-phone"></span><span class="text">231-526-3300</span></a>
                         </div>
-                        <?php get_template_part('parts/top-bar');?>
-                        <a id="sm-logo" class="show-for-small-down text-center" href="<?php bloginfo('url'); ?>"><img alt="True North Golf logo" src="<?php bloginfo('template_url'); ?>/assets/logo-white.png"></a>
-                    </header>
-                    <?php get_template_part('parts/off-canvas-menu');?>
+                    </div>
+                    <?php get_template_part('parts/top-bar');?>
+                    <a id="sm-logo" class="show-for-small-down text-center" href="<?php bloginfo('url'); ?>"><img alt="True North Golf logo" src="<?php bloginfo('template_url'); ?>/assets/logo-white.png"></a>
+                </header>
+                <?php get_template_part('parts/off-canvas-menu');?>

diff --git a/scss/_main.scss b/scss/_main.scss
index ac4b1c9..3a1abf0 100644 (file)
--- a/scss/_main.scss
+++ b/scss/_main.scss
@@ -110,6 +110,9 @@
         float: left;
     }
 }
+.orb-drop-shadow {
+    margin-top: -240px;
+}
 img.orb-shadow {
     position: relative;
     text-align: center;

diff --git a/scss/_topbar.scss b/scss/_topbar.scss
index 18cb3ce..228bcc3 100644 (file)
--- a/scss/_topbar.scss
+++ b/scss/_topbar.scss
@@ -127,7 +127,7 @@
     > div > ul {
         > li {
             a {
-                font-size: 16px;
+                font-size: 12px;
                 text-transform: uppercase;
                 font-family: "Montserrat", sans-serif;
             }

diff --git a/sidebar.php b/sidebar.php
index e9544a1..393a357 100644 (file)
--- a/sidebar.php
+++ b/sidebar.php
@@ -1,8 +1,8 @@
 <div class="row">
+    <?php if ( is_active_sidebar( 'sidebar-r' ) ) : ?>
     <div id="sidebar" class="small-12 columns">
-        <?php if ( is_active_sidebar( 'sidebar-r' ) ) : ?>
            <?php dynamic_sidebar( 'sidebar-r' ); ?>
-        <?php endif; ?>
     </div>
+    <?php endif; ?>
 </div>