From: Kevin Ball <kmball11@gmail.com>
Date: Tue, 27 Sep 2016 21:09:55 +0000 (-0700)
Subject: Merge branch 'master' into develop
X-Git-Tag: v6.2.4-rc1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f6224c6f03fb44762626bc7e7659ae2d0840d42;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'master' into develop
---

6f6224c6f03fb44762626bc7e7659ae2d0840d42
diff --cc docs/pages/flex-grid.md
index fdd88d4b3,6d5f6ca52..161c23e7d
--- a/docs/pages/flex-grid.md
+++ b/docs/pages/flex-grid.md
@@@ -242,15 -242,13 +242,15 @@@ The `.collapse` class lets you remove c
  
  There are times when you won't want each media query to be collapsed or uncollapsed. In this case, use the media query size you want and collapse or uncollapse and add that to your row element. Example shows no gutter at small media size and then adds the gutter to columns at medium.
  
 +The `.is-collapse-child` class removes negative margins from nested row under collapsed parent.
 +
  ```html
- <div class="row medium-uncollapse large-collapse">
+ <div class="row small-collapse medium-uncollapse">
    <div class="small-6 columns">
-     Removes gutter at large media query
+     Removes gutter at small media query and adds at medium.
    </div>
    <div class="small-6 columns">
-     Removes gutter at large media query
+     Removes gutter at small media query and adds at medium.
    </div>
  </div>
  ```