From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Tue, 13 Mar 2018 15:33:49 +0000 (-0400)
Subject: Merge tag 'v1.0.14' into develop
X-Git-Tag: v1.0.20^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=83bdc3aaa2eb184cb26af8173fdd3cd915c798e2;p=WP-Themes%2Fgaylordmichigan.git

Merge tag 'v1.0.14' into develop

changing the front page video source
---

83bdc3aaa2eb184cb26af8173fdd3cd915c798e2
diff --cc front-page.php
index c42834f,7e3d7be..80dd78e
--- a/front-page.php
+++ b/front-page.php
@@@ -11,13 -11,9 +11,13 @@@
                  <?php endif;?>
              </div>
          </div>
 -        <div class="row">
 -            <?php get_template_part('parts/glm-blocks'); ?>
 +        <div id="video">
 +            <video id="front-page-video" playsinline loop controls muted>
-                 <source src="<?php bloginfo('template_url'); ?>/assets/winter_video.mp4" type="video/mp4">
++                <source src="<?php bloginfo('template_url'); ?>/assets/gaylord.m4v" type="video/mp4">
 +            </video>
 +            <!-- <iframe width="560" height="315" src="https://www.youtube.com/embed/etv3-mo9Q-Y?rel=0" frameborder="0" allowfullscreen></iframe> -->
          </div>
 +        
          <div class="feature-events">
              <div id="event-feed-row" class="row">
                  <?php get_template_part('parts/event-feed'); ?>