From: Kevin Chu <kwhchu@users.noreply.github.com>
Date: Mon, 10 Apr 2017 16:26:25 +0000 (-0700)
Subject: Resolve merge conflict
X-Git-Tag: v6.4.0-rc1~46^2~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9958%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Resolve merge conflict
---

d808828d0954de1158a8422ea6ec69c6b2803768
diff --cc docs/pages/index.md
index f59f9d5e6,8cc8291b8..d490c9db0
--- a/docs/pages/index.md
+++ b/docs/pages/index.md
@@@ -24,14 -16,16 +24,16 @@@ There are a number of ways to install F
  
  ## New to Foundation for Sites?
  
 -With an easy to understand syntax and consistent structure, you'll learn your way around Foudnation in no time!
 +With an easy to understand syntax and consistent structure, you'll learn your way around Foundation in no time!
  
 -<ul class="accordion" data-accordion>
 -  <li class="accordion-item welcome-accordion-item is-active" data-accordion-item>
 +<ul class="accordion welcome-accordion" data-accordion data-allow-all-closed="true">
 +  <li class="accordion-item welcome-accordion-item" data-accordion-item>
      <a href="#" class="accordion-title">Intro Videos</a>
-     <div class="accordion-content " data-tab-content>
  
-       <div class="row">
+     <div class="accordion-content" data-tab-content>
+ 
+       <div class="row accordion-content-item">
+ 
          <div class="medium-4 columns">
            <img src="http://placehold.it/350x250">
          </div>