I did some re-work changes

We had confilicting ids in the theme and I edited it so the conflicts are
gone. I also did some styling to help with the layout appearance.

diff --git a/css/app.css b/css/app.css
index 4db7601..66a0e9a 100644 (file)
--- a/css/app.css
+++ b/css/app.css
@@ -6718,6 +6718,67 @@ header#page-header {
     color: #FFFFFF; }
   header#page-header h3.site-description {
     color: #FFFFFF; }
+  header#page-header .search input {
+    height: 20px;
+    width: 167px;
+    padding: 0 8px;
+    margin: 13px 0px 0px 18px;
+    border-radius: 3px;
+    font-size: 10px;
+    color: #000000;
+    display: inline-block; }
+  header#page-header .search a.magnifying-glass {
+    font-size: 10em;
+    /* This controls the size. */
+    display: inline-block;
+    width: 0.625rem;
+    height: 0.625rem;
+    border: 0.125rem solid #131c5f;
+    position: relative;
+    border-radius: 0.35em;
+    margin: 0 0 0 -25px; }
+    header#page-header .search a.magnifying-glass:before {
+      content: "";
+      display: inline-block;
+      position: absolute;
+      right: -0.4375rem;
+      bottom: -0.25rem;
+      border-width: 0;
+      background: #131c5f;
+      width: 0.5rem;
+      height: 0.125rem;
+      -webkit-transform: rotate(45deg);
+      -moz-transform: rotate(45deg);
+      -ms-transform: rotate(45deg);
+      transform: rotate(45deg); }
+  header#page-header #sec-nav {
+    position: relative;
+    text-align: left;
+    padding: 10px 0;
+    margin: 0 0 15px 45px; }
+    header#page-header #sec-nav ul {
+      margin: 0; }
+      header#page-header #sec-nav ul li {
+        display: inline; }
+        header#page-header #sec-nav ul li a {
+          font-size: 12px;
+          color: #131c5f;
+          padding: 0 5px;
+          font-weight: bold; }
+    header#page-header #sec-nav > ul > li {
+      position: relative; }
+      header#page-header #sec-nav > ul > li:before {
+        color: #999999;
+        content: "|";
+        position: absolute;
+        top: 2px;
+        left: -15px;
+        font-size: 14px;
+        font-weight: bold;
+        display: block;
+        padding: 0 10px; }
+      header#page-header #sec-nav > ul > li:first-child:before {
+        content: none; }
 
 #sm-logo img {
   padding-top: 20px; }
@@ -7078,6 +7139,7 @@ main.search-results #head-img {
 #slideshow {
   position: relative;
   margin-top: -295px;
+  top: -185px;
   z-index: -1; }
   @media only screen and (max-width: 40em) {
     #slideshow {
@@ -8031,6 +8093,29 @@ a#calendar-link {
     -ms-transform: rotate(45deg);
     transform: rotate(45deg); }
 
+.search-form {
+  text-align: left;
+  display: inline-block;
+  position: relative;
+  border-radius: 5px; }
+  .search-form input {
+    height: 20px;
+    width: 135px;
+    padding: 0 8px;
+    margin: 0px -10px 0px 18px;
+    border-radius: 3px;
+    font-size: 10px;
+    color: #000000;
+    display: inline-block; }
+    .search-form input.search-button {
+      width: 12px;
+      height: 12px;
+      padding: 0;
+      margin: 0;
+      position: relative;
+      top: 2px;
+      right: 10px; }
+
 .search-results #blog-posts-over .entry-meta {
   display: none; }
 .search-results #blog-posts-over p {

diff --git a/functions.php b/functions.php
index d0b9735..df1e33d 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -214,7 +214,7 @@ if ( ! function_exists( 'glm_theme_second_header' ) ) {
           'link_after' => '',                             // after each link text
           'depth' => 3,                                   // limit the depth of the nav
           'fallback_cb' => false,                         // fallback function (see below)
-          'walker' => new Glm_Theme_Top_Bar_Walker()
+          'walker' => false
       ));
   }
 }

diff --git a/header.php b/header.php
index c469ea8..fbc97b6 100644 (file)
--- a/header.php
+++ b/header.php
@@ -15,20 +15,31 @@
       <div class="off-canvas-wrap" data-offcanvas>
         <div class="inner-wrap">
             <div id="page-wrapper">
-                    <header id="page-header" class="text-center">
-                        <?php get_custom_logo($blog_id = 0 );?>
-                        <?php the_custom_logo($blog_id = 0 );?>
-                        <?php
-                        if ( is_front_page() && is_home() ) : ?>
-                            <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
-                        <?php else : ?>
-                            <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
-                        <?php endif;
-                        $description = get_bloginfo( 'description', 'display' );
-                        if ( $description || is_customize_preview() ) : ?>
-                            <h3 class="site-description"><?php echo $description; ?></h3>
-                        <?php endif;
-                        ?>
+                    <header id="page-header">
+                        <div class="large-4 columns">
+                            <h1></h1>
+                        </div>
+                        <div class="small-12 large-4 columns text-center">
+                            <?php get_custom_logo($blog_id = 0 );?>
+                            <?php the_custom_logo($blog_id = 0 );?>
+                            <?php
+                            if ( is_front_page() && is_home() ) : ?>
+                                <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+                            <?php else : ?>
+                                <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+                            <?php endif;
+                            $description = get_bloginfo( 'description', 'display' );
+                            if ( $description || is_customize_preview() ) : ?>
+                                <h3 class="site-description"><?php echo $description; ?></h3>
+                            <?php endif;
+                            ?>
+                        </div>
+                        <div class="large-4 columns">
+                            <?php get_template_part('parts/search');?>
+                            <ul id="sec-nav" class="right">
+                                <?php glm_theme_second_header(); ?>
+                            </ul>
+                        </div>
                         <?php get_template_part('parts/top-bar');?>
                     </header>
                     <?php get_template_part('parts/off-canvas-menu');?>

diff --git a/parts/off-canvas-menu.php b/parts/off-canvas-menu.php
index 9da354b..fa3970a 100644 (file)
--- a/parts/off-canvas-menu.php
+++ b/parts/off-canvas-menu.php
@@ -6,16 +6,4 @@
         <input type="submit" class="button" name="submit" value="Search">
     </form>
     <?php get_template_part('parts/client-info-offcanvas');?>
-    <ul class="offcavas-social-list">
-        <li><a target="_blank" href="https://www.facebook.com/pages/Mount-Pleasant-Area-Convention-and-Visitors-Bureau/55686552727"><img alt="Facebook" src="<?php bloginfo('template_url'); ?>/assets/facebook-icon.png"></a></li>
-        <li><a target="_blank" href="https://twitter.com/MtPleasantCVB"><img alt="Twitter" src="<?php bloginfo('template_url'); ?>/assets/twitter-icon.png"></a></li>
-        <li><a target="_blank" href="http://www.youtube.com/user/mountpleasantwow"><img alt="YouTube" src="<?php bloginfo('template_url'); ?>/assets/youtube-icon.png"></a></li>
-        <li><a target="_blank" href="https://instagram.com/mtpleasantcvb"><img alt="Instagram" src="<?php bloginfo('template_url'); ?>/assets/instagram.png"></a></li>
-        <li>
-            <?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;?>
-        </li>
-    </ul>
 </aside>

diff --git a/parts/search.php b/parts/search.php
index b66e968..689ba90 100644 (file)
--- a/parts/search.php
+++ b/parts/search.php
@@ -1,5 +1,5 @@
-<form role="search" method="get" id="searchform" class="show-for-large-up right" action="<?php echo home_url('/').'site-search/'; ?>">
-     <input class="search-input" type="search" placeholder="SEARCH" value="" name="query" id="lar-search">
+<form role="search" method="get" class="show-for-large-up right search-form" action="<?php echo home_url('/').'site-search/'; ?>">
+     <input class="search-input" type="search" placeholder="SEARCH" value="" name="query">
      <input class="search-button" type="image" alt="Search"
         src="<?php bloginfo('template_url'); ?>/assets/search_icon.png"
         name="searchButton">

diff --git a/scss/_page.header.scss b/scss/_page.header.scss
index 26b8f1a..d5b9244 100644 (file)
--- a/scss/_page.header.scss
+++ b/scss/_page.header.scss
@@ -48,80 +48,80 @@ header#page-header {
 //            right: 0;
 //        }
 //    }
-//    & .search {
-//        input {
-//            height: 20px;
-//            width: 167px;
-//            padding: 0 8px;
-//            margin: 13px 0px 0px 18px;
-//            border-radius: 3px;
-//            font-size: 10px;
-//            color: $black;
-//            display: inline-block;
-//        }
-//        a {
-//            &.magnifying-glass {
-//                font-size: 10em; /* This controls the size. */ 
-//                display: inline-block; 
-//                width: rem-calc(10); 
-//                height: rem-calc(10);
-//                border: rem-calc(2) solid $d-blue; 
-//                position: relative; 
-//                border-radius: 0.35em;
-//                margin: 0 0 0 -25px;
-//                &:before {
-//                    content: ""; 
-//                    display: inline-block; 
-//                    position: absolute; 
-//                    right: rem-calc(-7); 
-//                    bottom: rem-calc(-4); 
-//                    border-width: 0; 
-//                    background: $d-blue; 
-//                    width: rem-calc(8); 
-//                    height: rem-calc(2); 
-//                    -webkit-transform: rotate(45deg); 
-//                    -moz-transform: rotate(45deg);
-//                    -ms-transform: rotate(45deg);
-//                    transform: rotate(45deg);
-//                }
-//            }
-//        }
-//    }
-//    #sec-nav {
-//        position: relative;
-//        text-align: left;
-//        padding: 10px 0;
-//        margin: 0 0 15px 45px;
-//        ul {
-//            margin: 0;
-//            li {
-//                display: inline;
-//                a {
-//                    font-size: 12px;
-//                    color: $d-blue;
-//                    padding: 0 5px;
-//                    font-weight: bold;
-//                }
-//            }
-//        }
-//        & > ul > li {
-//            position: relative;
-//            &:before {
-//                color: $aluminum;
-//                content: "|";
-//                position: absolute;
-//                top: 2px;
-//                left: -15px;
-//                font-size: 14px;
-//                font-weight: bold;
-//                display:block;
-//                padding: 0 10px;
-//            }
-//            &:first-child:before {
-//                content: none;
-//            }
-//        }
-//    }
+    & .search {
+        input {
+            height: 20px;
+            width: 167px;
+            padding: 0 8px;
+            margin: 13px 0px 0px 18px;
+            border-radius: 3px;
+            font-size: 10px;
+            color: $black;
+            display: inline-block;
+        }
+        a {
+            &.magnifying-glass {
+                font-size: 10em; /* This controls the size. */ 
+                display: inline-block; 
+                width: rem-calc(10); 
+                height: rem-calc(10);
+                border: rem-calc(2) solid $d-blue; 
+                position: relative; 
+                border-radius: 0.35em;
+                margin: 0 0 0 -25px;
+                &:before {
+                    content: ""; 
+                    display: inline-block; 
+                    position: absolute; 
+                    right: rem-calc(-7); 
+                    bottom: rem-calc(-4); 
+                    border-width: 0; 
+                    background: $d-blue; 
+                    width: rem-calc(8); 
+                    height: rem-calc(2); 
+                    -webkit-transform: rotate(45deg); 
+                    -moz-transform: rotate(45deg);
+                    -ms-transform: rotate(45deg);
+                    transform: rotate(45deg);
+                }
+            }
+        }
+    }
+    #sec-nav {
+        position: relative;
+        text-align: left;
+        padding: 10px 0;
+        margin: 0 0 15px 45px;
+        ul {
+            margin: 0;
+            li {
+                display: inline;
+                a {
+                    font-size: 12px;
+                    color: $d-blue;
+                    padding: 0 5px;
+                    font-weight: bold;
+                }
+            }
+        }
+        & > ul > li {
+            position: relative;
+            &:before {
+                color: $aluminum;
+                content: "|";
+                position: absolute;
+                top: 2px;
+                left: -15px;
+                font-size: 14px;
+                font-weight: bold;
+                display:block;
+                padding: 0 10px;
+            }
+            &:first-child:before {
+                content: none;
+            }
+        }
+    }
 //    img {
 //        margin-left: 5px;
 //    }

diff --git a/scss/_search.scss b/scss/_search.scss
index 04f7c81..66937b7 100644 (file)
--- a/scss/_search.scss
+++ b/scss/_search.scss
@@ -59,6 +59,31 @@
             }
         }
 }
+.search-form {
+    text-align: left;
+    display: inline-block;
+    position: relative;
+    border-radius: 5px;
+    input {
+        height: 20px;
+        width: 135px;
+        padding: 0 8px;
+        margin: 0px -10px 0px 18px;
+        border-radius: 3px;
+        font-size: 10px;
+        color: $black;
+        display: inline-block;
+        &.search-button {
+            width: 12px;
+            height: 12px;
+            padding: 0;
+            margin: 0;
+            position: relative;
+            top: 2px;
+            right: 10px;
+        }
+    }        
+}
 .search-results {
     #blog-posts-over .entry-meta {
         display: none;

diff --git a/scss/_slideshow.scss b/scss/_slideshow.scss
index de233ba..e5c946f 100644 (file)
--- a/scss/_slideshow.scss
+++ b/scss/_slideshow.scss
@@ -1,7 +1,7 @@
 #slideshow {
     position: relative;
     margin-top: -295px;
-//    top: -185px;
+    top: -185px;
     z-index: -1;
     @media #{$small-only} {
         margin-top: -140px;