]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into v6.3
authorKevin Ball <kmball11@gmail.com>
Wed, 28 Sep 2016 18:41:46 +0000 (11:41 -0700)
committerKevin Ball <kmball11@gmail.com>
Wed, 28 Sep 2016 18:41:46 +0000 (11:41 -0700)
1  2 
docs/pages/off-canvas.md
docs/partials/off-canvi.html
js/foundation.drilldown.js
scss/settings/_settings.scss

Simple merge
index 94430ee6a9830fecf6593ce4438ac7e207801f82,d225457dec3aec6525d1e9a31165ef9c1e7e7361..2a8a09b6068c456176aa83ce6c484b161a40baa7
@@@ -3,18 -3,19 +3,19 @@@
      <span aria-hidden="true">&times;</span>
    </button>
    <ul class="mobile-ofc vertical menu">
 -    
 +
      <li>
-       <a href="http://foundation.zurb.com/learn/about.html">Learn</a>
+       <a href="http://zurb.com/responsive">Showcase</a>
        <ul class="submenu menu vertical" data-submenu>
-         <li><a href="http://foundation.zurb.com/learn/about.html">About Foundation</a></li>
-         <li><a href="http://foundation.zurb.com/learn/tutorials.html">Tutorials</a></li>
-         <li><a href="http://foundation.zurb.com/learn/classes.html">Classes</a></li>
-         <li><a href="http://foundation.zurb.com/learn/case-studies.html">Case Studies</a></li>
-         <li><a href="http://foundation.zurb.com/learn/brands.html">Brands</a></li>
+         <li><a href="http://zurb.com/responsive">Foundation Showcase</a></li>
+         <li><a href="http://foundation.zurb.com/showcase/brands.html">Brands</a></li>
+         <li><a href="http://foundation.zurb.com/showcase/case-studies.html">Case Studies</a></li>
+         <li><a href="http://foundation.zurb.com/showcase/blog.html">Blog</a></li>
+         <li><a href="http://foundation.zurb.com/showcase/buzz.html">Buzz</a></li>
+         <li><a href="http://foundation.zurb.com/showcase/about.html">About Foundation</a></li>
        </ul>
      </li>
 -    
 +
      <li>
        <a href="http://foundation.zurb.com/develop/getting-started.html">Develop</a>
        <ul class="submenu menu vertical" data-submenu>
        </ul>
      </li>
  
-     <li><a href="http://foundation.zurb.com/upload.html">Upload</a></li>
+     <li>
+       <a href="http://foundation.zurb.com/learn/tutorials.html">Tutorials</a>
+       <ul class="submenu menu vertical" data-submenu>
+         <li><a href="http://foundation.zurb.com/learn/tutorials.html">Tutorials</a></li>
+         <li><a href="http://foundation.zurb.com/learn/classes.html">Classes</a></li>
+         <li><a href="http://foundation.zurb.com/learn/custom-training.html">Custom Training</a></li>
+         <li><a href="http://foundation.zurb.com/learn/certification.html">Certification</a></li>
+         <li><a href="http://foundation.zurb.com/learn/responsive-reading.html">Responsive Reading</a></li>
+       </ul>
+     </li>
 -    
 +
      <li>
-       <a href="http://foundation.zurb.com/support/support.html">Support</a>
+       <a href="http://foundation.zurb.com/get-involved/support.html">Get Involved</a>
        <ul class="submenu menu vertical" data-submenu>
-         <li><a href="http://foundation.zurb.com/support/support.html">Support Channels</a></li>
-         <li><a href="http://foundation.zurb.com/support/premium-support.html">Premium Support</a></li>
+         <li><a href="http://foundation.zurb.com/get-involved/support.html">Connect</a></li>
+         <li><a href="http://foundation.zurb.com/get-involved/premium-support.html">PLZ Halp</a></li>
          <li><a href="http://foundation.zurb.com/forum/sort/unanswered">Foundation Forum</a></li>
-         <li><a href="http://foundation.zurb.com/support/faq.html">FAQs</a></li>
+         <li><a href="http://foundation.zurb.com/learn/events.html">Events</a></li>
+         <li><a href="http://foundation.zurb.com/get-involved/faq.html">FAQs</a></li>
+         <li><a href="http://foundation.zurb.com/get-involved/contribute.html">Contribute</a></li>
+         <li><a href="http://foundation.zurb.com/get-involved/yetinauts.html">Yetinauts</a></li>
        </ul>
      </li>
 -    
 +
      <li>
        <a href="http://foundation.zurb.com/frameworks-docs.html">Docs</a>
        <ul class="submenu menu vertical" data-submenu>
Simple merge
Simple merge