From: Ove Klykken <klykken@gmail.com>
Date: Tue, 10 Jun 2014 18:24:10 +0000 (-0400)
Subject: Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into feature/template
X-Git-Tag: v1.0^2~78^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=59826b45056c56518db45676b2f61ca8933c75cd;p=web%2FSooLocks.git

Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into feature/template
---

59826b45056c56518db45676b2f61ca8933c75cd
diff --cc templates/template.html
index df7bde3,6cb92db..da3a3e8
--- a/templates/template.html
+++ b/templates/template.html
@@@ -120,15 -108,13 +108,19 @@@
                  </div>
  
                  <div class="medium-3 columns medium-pull-9" id="barParent">
+                 <div id="sidenav" flexy:if="sideNav">
+                     {sideNav:h}
+                 </div>
+ 
                      <section id="bar" data-equalizer-watch>
 -                        <a href="#" id="brochure">Download our Brochure</a>
 -                        <img src="{mediaBaseURL:h}assets/passport.png" id="passport">
 +                        <div class="row">
 +                            <div class="small-6 medium-12 columns">
 +                                <a href="#" id="brochure">Download our Brochure</a>
 +                            </div>
 +                            <div class="small-6 medium-12 columns">
 +                                <img src="{mediaBaseURL:h}assets/passport.png" id="passport">
 +                            </div>
 +                        </div>
                      </section>
                  </div>
              </div>
@@@ -160,10 -147,9 +152,9 @@@
                  </div>
              </div>
          </section>
 -
 +        <a class="exit-off-canvas"></a>
      </div>
  </div>
- {bottomScripts:h}
  <script src="{mediaBaseURL:h}libjs/vendor/jquery.js"></script>
  <script src="{mediaBaseURL:h}libjs/foundation.min.js"></script>
  <script src="{mediaBaseURL:h}libjs/foundation/foundation.equalizer.js"></script>