Merge branch 'develop' of cvs2:WP-Themes/SierraSands into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 8 Dec 2016 20:56:29 +0000 (15:56 -0500)
committerIan Weller <ian@gaslightmedia.com>
Thu, 8 Dec 2016 20:56:29 +0000 (15:56 -0500)
1  2 
header.php

diff --cc header.php
      <body>
      <div class="off-canvas-wrap" data-offcanvas>
      <div class="inner-wrap">
 -        <aside class="left-off-canvas-menu hide-for-large-up">
 -            <?php glm_page_menu(); ?>
 -        </aside>
 -        <?php get_sidebar(); ?>
 -<<<<<<< HEAD
 -        <div class="row content">
 -            <div class="small-12 columns">
 -                <header>
 -                    <div class="row">
 -                        <div id="logo" class="small-12 medium-3 columns">    
 -                            <a href="<?php bloginfo('url');?>"><img src="<?php echo get_template_directory_uri(); ?>/assets/logo.png"></a>
 -                        </div>
 -                        <div id="logo_text" class="small-12 medium-5 columns">
 -                            <p>
 -                                Charlevoix - Cheboygan - Emmet <br> Tri-County <br> Office of Emergency Management
 -                            </p>
 -                        </div>
 -                        <div id="top" class="small-12 medium-4 right columns">
 -                            <div id="header_social" class="small-1 columns">
 -                                <div id="icons">
 -                                    <a id="face" target="_blank" href="www.facebook.com/pages/Charlevoix-Cheboygan-Emmet-Office-of-Emergency-Management/172092252841082"><img src="<?php echo get_template_directory_uri(); ?>/assets/facebook.jpg"></a>
 -                                </div>
 +        <header>
 +            <div id="top">
 +                <div class="row">
 +                    <div class="small-12 medium-4 right columns show-for-large-up">
 +                        <div id="header_social" class="small-8 columns">
 +                            <div id="icons">
 +                                <a href="http://www.facebook.com/sierrasandsfamilylodge" id="fb" target="_blank" title="Our Facebook Page"></a>
 +                                <a href="https://twitter.com/sierra_sands" id="tw" target="_blank" title="Twitter"></a>
 +                                <a href="http://www.youtube.com/user/SierraSandsLodge" id="yt" target="_blank" title="You Tube"></a>
 +                                <a href="http://instagram.com/sierrasandsfamilylodge" id="ig" target="_blank" title="Instagram"></a>
                              </div>
-                         </div>
-     <!--                            <div id="header_phone" class="small-0 columns">
-                             <p></p>
-                         </div>-->
-                         <div id="header_contact" class="small-4 right columns">
-                             <a href="<?php bloginfo('url');?>/contact-us"><p>Contact</p></a>
-                         </div>
 -                            <div id="header_phone" class="small-5 columns">
 -                                <p>855-515-1624</p>
+                             </div>
 -                            <div id="header_contact" class="small-5 right columns">
++                            <div id="header_contact" class="small-4 right columns">
+                                 <a href="<?php bloginfo('url');?>/contact-us"><p>Contact</p></a>
+                             </div>
 -=======
 -        <header class="row">
 -            <div>
 -                <a href="<?php bloginfo('url');?>">
 -                    <div id="logo" class="small-12 medium-3 columns">    
 -                        <img src="<?php echo get_template_directory_uri(); ?>/assets/logo.gif">
 -                    </div>
 -                </a>
 -<!--                        <div id="logo_text" class="small-12 medium-5 columns">
 -                    <p>
 -                    </p>
 -                </div>-->
 -                <div id="top" class="small-12 medium-4 right columns show-for-large-up">
 -                    <div id="header_social" class="small-8 columns">
 -                        <div id="icons">
 -                            <a href="http://www.facebook.com/sierrasandsfamilylodge" id="fb" target="_blank" title="Our Facebook Page"></a>
 -                            <a href="https://twitter.com/sierra_sands" id="tw" target="_blank" title="Twitter"></a>
 -                            <a href="http://www.youtube.com/user/SierraSandsLodge" id="yt" target="_blank" title="You Tube"></a>
 -                            <a href="http://instagram.com/sierrasandsfamilylodge" id="ig" target="_blank" title="Instagram"></a>
 ->>>>>>> V1.0.0
 -                        </div>
 -                    </div>
 -<!--                            <div id="header_phone" class="small-0 columns">
 -                        <p></p>
 -                    </div>-->
 -                    <div id="header_contact" class="small-4 right columns">
 -                        <a href="<?php bloginfo('url');?>/contact-us"><p>Contact</p></a>
                      </div>
-                 </div>                    
+                 </div>
 -<!--                        <div id="searchform_container" class="small-12 medium-3 columns alignright">
 -                        <form id="searchform" action="<?php bloginfo('url'); ?>" method="get">
 -                            <div><input id="s" class="text" type="text" name="s" value="" />
 -                            <input class="submit button blogbutton" type="submit" name="submit" value="Search" />
 -                             </div>
 -                        </form>
 -                    </div>-->
 -                <div id="search_top_wrapper" class="row">
 -
 -                    <div class="search-form show-for-large-up">
 -                        <form id="searchform" action="<?php bloginfo('url'); ?>" method="get">
 -                            <div id="search_top" class="small-12 medium-4 right columns">
 -                                <div class="row collapse">
 -                                    <div class="small-10 columns "><input class="small-10 columns" name="s" id="s" type="text" placeholder="  Search the site"></div>
 -                                    <div class="small-2 columns"><a class="left button" href="#"><div id="spyglass"></div></a></div>
 -                                </div>
 -                            </div>
 -                        </form>
 -                    </div>
 -                </div>
 -                <div class="row show-for-large-up">
 -                    <div class="large-12 text-center">
 -                        <nav class="top-bar" data-topbar role="navigation">
 -                        <section class="top-bar-section">
 -                            <?php glm_page_menu(); ?>
 -                        </section>
 -                        </nav>
 -                    </div>
 +            </div>
 +            <div class="row">
 +                <div class="small-12 columns">
 +                    <a class="left show-for-medium-down"><img src="<?php echo get_template_directory_uri(); ?>/assets/sierra-sands-logo-shadow.png"></a>
 +                    <a class="reservation right" href="<?php echo get_permalink(623); ?>"></a>
                  </div>
 -                    <!Off-canvas-Menu!>
              </div>
 -
 -
          </header>
 -        <div class="row content">
 +        <div class="row collapse content">
              <div class="small-12 columns">
 -                
 +                <nav class="top-bar show-for-large-up" data-topbar role="navigation">
 +                    <a id="home-logo" href="<?php bloginfo('url');?>"><img src="<?php echo get_template_directory_uri(); ?>/assets/sierra-sands-logo-shadow.png"></a>
 +                    <section class="top-bar-section right">
 +                        <?php top_bar(); ?>
 +                    </section>
 +                </nav>
                  <nav class="tab-bar hide-for-large-up row">
                      <section class="left-small">
                          <a class="left-off-canvas-toggle menu-icon" href="#"><span>Menu</span></a>