From: RafiBomb <rafi@zurb.com>
Date: Tue, 16 May 2017 04:23:19 +0000 (-0700)
Subject: fixes merge conflicts
X-Git-Tag: v6.4.0-rc1~46^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c289739b3fc9c63b673d1b5810fba4ebbb057bf;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

fixes merge conflicts
---

5c289739b3fc9c63b673d1b5810fba4ebbb057bf
diff --cc docs/pages/index.md
index e50c59cf1,f1fb834dd..b123f5214
--- a/docs/pages/index.md
+++ b/docs/pages/index.md
@@@ -157,35 -158,55 +157,35 @@@ With an easy to understand syntax and c
    </li>
  
    <li class="accordion-item welcome-accordion-item" data-accordion-item>
 -    <a href="#" class="accordion-title">Why Foundation</a>
 -
 +    <a href="#" class="accordion-title">Additional Resources</a>
      <div class="accordion-content" data-tab-content>
  
--      <div class="row accordion-content-item">
-         <a target="_blank" href="https://youtu.be/3nCXVJXe_gg">
 -        <div class="medium-4 columns accordion-content-item-thumbnail">
 -          <div class="responsive-embed widescreen">
 -            <iframe width="560" height="315" src="https://www.youtube.com/embed/dZZk9Kz5j_0" frameborder="0" allowfullscreen></iframe>
++      <a target="_blank" href="https://youtu.be/3nCXVJXe_gg">
++        <div class="row accordion-content-item">
 +          <div class="medium-4 columns accordion-content-item-thumbnail">
 +            <img src="{{root}}assets/img/zero-to-website.png" class="" height="" width="" alt="">
            </div>
 -        </div>
 -        <div class="medium-8 columns">
 -          <h5>The World’s Most Advanced Front-end Framework</h5>
 -          <p>Coming from another framework? It’s the perfect time to make the switch and learn Foundation. Not only have we revamped all of our documentation and put together a brand new, cutting edge set of Building Blocks to learn from, but we’ve prepared a great resource to help you bring your team on board. Download our free e-book to get your guide to convincing your team that Foundation is better, easy to learn, and more flexible than their current framework.
 -          </p>
 -          <a target="_blank" href="#" class="accordion-content-item-cta">Learn More</a>
 -        </div>
 -      </div>
 -
 -      <div class="row accordion-content-item">
 -        <div class="medium-4 columns accordion-content-item-thumbnail">
 -          <div class="responsive-embed widescreen">
 -            <iframe width="560" height="315" src="https://www.youtube.com/embed/dZZk9Kz5j_0" frameborder="0" allowfullscreen></iframe>
 +          <div class="medium-8 columns">
 +            <h5>Zero to Website Lessons</h5>
 +            <p>A great place to start! Laurel and Christine from ZURB take you through the basics all the way to deploying your first site.</p>
 +            <span class="accordion-content-item-cta">Watch Video</span>
            </div>
-         </a>
-       </div>
+         </div>
 -        <div class="medium-8 columns">
 -          <h5>Build Your Career on a Solid Foundation</h5>
 -          <p>Web technologies are rapidly changing, but time and resources are finite. It can be difficult to determine where to invest your energy to get a return on your investment. Learning Foundation places you at the cutting edge of the website development. Over Foundation’s 5 year history, it has consistently led the pack, changing the way the web is designed and built. Download our free e-book to learn more about the professional opportunities with the world’s most advanced front-end framework, and get started building YOUR career on a solid Foundation.
 -          </p>
 -          <a target="_blank" href="#" class="accordion-content-item-cta">Learn More</a>
 -        </div>
 -      </div>
++      </a>
  
-       <div class="row accordion-content-item accordion-course-callout">
 -      <!-- 
 -      <div class="row accordion-content-item">
--        <div class="medium-4 columns accordion-content-item-thumbnail">
-           <a target="_blank" href="http://zurb.com/university/foundation-intro" class="accordion-content-item-cta">
 -          <div class="responsive-embed widescreen">
 -            <iframe width="560" height="315" src="https://www.youtube.com/embed/dZZk9Kz5j_0" frameborder="0" allowfullscreen></iframe>
++      <a target="_blank" href="http://zurb.com/university/foundation-intro">
++        <div class="row accordion-content-item accordion-course-callout">
++          <div class="medium-4 columns accordion-content-item-thumbnail">
 +            <img src="{{root}}assets/img/foundation-intro-class.jpg" style="height: 142px;">
-           </a>
-         </div>
+           </div>
 -        </div>
          <div class="medium-8 columns">
 -          <h5>Leverage the Power of Design for Your Business</h5>
 -          <p>With a robust ecosystem of community integrations, and the new Foundation Building Blocks, Foundation can help bridge the gap between your development team and your designers. Check out our free e-book on how you can use Foundation to leverage the power of design in your business.
 -          </p>
 -          <a target="_blank" href="#" class="accordion-content-item-cta">Learn More</a>
 +          <h5>Live Webinar: Introduction to Foundation 6</h5>
 +          <p>Achieve maximum thrust by learning how to use Foundation 6 to power your projects. The Foundation team will get you up to speed on everything you need to know to get the most out of Foundation 6.</p>
-           <a target="_blank" href="http://zurb.com/university/foundation-intro" class="accordion-content-item-cta">Learn More</a>
++          <span href="http://zurb.com/university/foundation-intro" class="accordion-content-item-cta">Learn More</span>
          </div>
        </div>
 -      -->
  
+ 
      </div>
    </li>