From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 20 Jun 2014 17:30:09 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2:web/SooLocks into develop
X-Git-Tag: v1.0^2~29^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=adb8c7a17fa675ac29bc7024c142a6894d67d34d;p=web%2FSooLocks.git

Merge branch 'develop' of cvs2:web/SooLocks into develop
---

adb8c7a17fa675ac29bc7024c142a6894d67d34d
diff --cc templates/template.html
index 544235c,c9a10ca..f707c28
--- a/templates/template.html
+++ b/templates/template.html
@@@ -29,11 -28,27 +29,11 @@@ $(function() 
                  <section class="left-small">
                      <a class="left-off-canvas-toggle menu-icon" href="#"><span></span></a>
                  </section>
-                   <h1 id="logoSmall">Soo Locks Boat Tours</h1>  <!-- <img src="{baseURLDefined:h}assets/logoSmall.png" id="logoSmall" class="right"> -->
+                   <h1 id="logoSmall">Soo Locks Boat Tours</h1>
              </nav>
          </div>
 -        <aside class="left-off-canvas-menu">
 -            <ul class="off-canvas-list">
 -                <li class="menu-icon">
 -                    <a href="{homePageUrl:h}">Home</a>
 -                </li>
 -                <li>
 -                    <a href="{baseURLDefined:h}tours-2/">Tours &amp; Cruises</a>
 -                </li>
 -                <li>
 -                    <a href="{baseURLDefined:h}tickets-3">Tickets, Packages &amp; Coupons</a>
 -                </li>
 -                <li>
 -                    <a href="{baseURLDefined:h}groups-4">Groups &amp; School Rates</a>
 -                </li>
 -                <li>
 -                    <a href="{baseURLDefined:h}about_us-5/">About</a>
 -                </li>
 -            </ul>
 +        <aside class="left-off-canvas-menu" id="mobilenav">
 +            {mainNav:h}
          </aside>
          <section class="main-section">
              <div class="row">