From: Kevin Ball <kmball11@gmail.com>
Date: Tue, 4 Jul 2017 05:13:57 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/zurb/foundation-sites
X-Git-Tag: v6.4.2-rc2~1^2^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=717162a49c0761bd9defd38dccfa97ff735b0423;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'master' of https://github.com/zurb/foundation-sites
---

717162a49c0761bd9defd38dccfa97ff735b0423
diff --cc docs/assets/scss/docs.scss
index 259e7907c,cef66d15e..e6cc296fa
--- a/docs/assets/scss/docs.scss
+++ b/docs/assets/scss/docs.scss
@@@ -456,6 -441,7 +456,11 @@@ a[data-open-video] 
    }
  }
  
 +.docs-off-canvas-content {
 +  padding-top: 130px;
 +}
++
+ .training-callout {
+   border-left: 3px solid $primary-color;
+   box-shadow: 0 2px 10px rgba(0, 0, 0, 0.17);
+ }