Now I thing I got the header right.
authorIan Weller <ian@gaslightmedia.com>
Tue, 28 Mar 2017 20:59:38 +0000 (16:59 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 28 Mar 2017 20:59:38 +0000 (16:59 -0400)
I have the header are correct I think.

css/app.css
header.php
scss/_page.header.scss
scss/_topbar.scss

index 3d01acc..e950f73 100644 (file)
@@ -6485,11 +6485,6 @@ header#page-header {
     header#page-header #top .search-top {
       position: absolute;
       right: 0; }
-      header#page-header #top .search-top #golf-logo {
-        margin-top: 5px; }
-        @media (max-width: 1055px) {
-          header#page-header #top .search-top #golf-logo {
-            margin-top: 25px; } }
   header#page-header .search input {
     height: 20px;
     width: 167px;
@@ -6527,6 +6522,13 @@ header#page-header {
 #sm-logo img {
   padding-top: 20px; }
 
+.golf-container {
+  position: relative; }
+  .golf-container #golf-logo {
+    position: absolute;
+    top: 0;
+    right: 0; }
+
 ul#sec-nav {
   display: inline-block;
   z-index: 1;
@@ -6570,7 +6572,7 @@ ul#sec-nav {
     text-align: right; }
 
 .top-bar {
-  margin-top: 125px; }
+  margin-top: 105px; }
   @media (max-width: 1055px) {
     .top-bar {
       display: none !important; } }
index e0613ac..9141804 100644 (file)
@@ -57,15 +57,18 @@ Note 2: 'Nb cols' parameter for Bootstrap only.
                                 <?php get_template_part('parts/search');?>
                                 <ul id="sec-nav" class="right">
                                     <li><a href="<?php bloginfo('url'); ?>">Home</a></li>
+                                    <li><a href="#">Contact</a></li>
                                     <?php $contactPage = get_post(3038);?>
                                     <?php if($contactPage):?>
                                     <li><a href="<?php echo get_page_link($contactPage->ID);?>">Contact</a></li>
                                     <?php endif;?>
                                 </ul>
-                                <a id="golf-logo" class="right"><img alt="Michigan's Central Swing" src="<?php bloginfo('template_url'); ?>/assets/central-swing-logo-interior.jpg"></a>
                             </div>
                         </div>
                         <?php get_template_part('parts/top-bar');?>
+                        <div class="row collapse golf-container">
+                            <img id="golf-logo" alt="Michigan's Central Swing" src="<?php bloginfo('template_url'); ?>/assets/central-swing-logo-interior.jpg">
+                        </div>
                         <a id="sm-logo" class="show-for-small-down text-center" href="<?php bloginfo('url'); ?>"><img alt="Mount Pleasant logo" src="<?php bloginfo('template_url'); ?>/assets/mt-pleasant-pure-mi-logo.png"></a>
                     </header>
                     <?php get_template_part('parts/off-canvas-menu');?>
index 67460e3..beb5508 100644 (file)
@@ -40,12 +40,6 @@ header#page-header {
         .search-top {
             position: absolute;
             right: 0;
-            #golf-logo {
-                margin-top: 5px;
-                @media (max-width: 1055px) {
-                    margin-top: 25px;
-                }
-            }
         }
     }
     & .search {
@@ -131,6 +125,14 @@ header#page-header {
         padding-top: 20px;
     }
 }
+.golf-container {
+    position: relative;
+    #golf-logo {
+        position: absolute;
+        top: 0;
+        right: 0;
+    }
+}
 ul#sec-nav {
     display: inline-block;
     z-index: 1;
index 7b43ebd..8e6dbd5 100644 (file)
@@ -18,7 +18,7 @@
     }
 }
 .top-bar {
-    margin-top: 125px;
+    margin-top: 105px;
     @media (max-width: 1055px) {
         display: none !important;
     }
@@ -60,6 +60,9 @@
 //                    text-shadow: -1 0 1px $d-blue;
 //                    text-shadow: 0 -1 1px $d-blue;
                 }
+            }
+            &:last-child {
+                
             }
             &.menu-item-has-children.has-dropdown {
                 a {