From: Joe Workman <joe@workmanmail.com>
Date: Mon, 21 Oct 2019 22:10:40 +0000 (-0700)
Subject: Merge branch 'master-6.5.3' into master-new
X-Git-Tag: v6.6.0~7^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0826719ea0f007c7d4816e2c133724724efb129d;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'master-6.5.3' into master-new

# Conflicts:
#	CONTRIBUTING.md
#	README.md
#	docs/pages/abide.md
#	docs/pages/grid.md
#	docs/pages/installation.md
#	docs/pages/motion-ui.md
#	docs/pages/prototyping-utilities.md
#	docs/pages/sass.md
#	docs/partials/footer.html
#	js/foundation.abide.js
#	js/foundation.magellan.js
#	package-lock.json
#	package.json
#	yarn.lock
---

0826719ea0f007c7d4816e2c133724724efb129d
diff --cc docs/pages/xy-grid.md
index c5db80c54,f979e2e5a..b2517f764
--- a/docs/pages/xy-grid.md
+++ b/docs/pages/xy-grid.md
@@@ -81,12 -81,12 +81,16 @@@ The structure of XY grid uses `.grid-x`
  ## Gutters
  
  The defining feature of the XY grid is the ability to use margin AND padding grids in harmony.
- To define a grid type, simply set `.grid-margin-x` or `.grid-padding-x` on the grid.
+ To define a grid type, simply set `.grid-margin-x`/`.grid-margin-y` or `.grid-padding-x`/`.grid-padding-y` on the grid.
+ 
+ <p>
+   <a class="" data-open-video="5:43"><img src="{{root}}assets/img/icons/watch-video-icon.svg" class="video-icon" height="30" width="30" alt=""> Watch this part in video</a>
+ </p>
  
 +<p>
 +  <a class="" data-open-video="5:43"><img src="{{root}}assets/img/icons/watch-video-icon.svg" class="video-icon" height="30" width="30" alt=""> Watch this part in video</a>
 +</p>
 +
  <div class="docs-codepen-container">
  <a class="codepen-logo-link" href="https://codepen.io/ZURBFoundation/pen/owvqYp?editors=1000" target="_blank"><img src="{{root}}assets/img/logos/edit-in-browser.svg" class="" height="" width="" alt="edit on codepen button"></a>
  </div>