Merge pull request #9757 from jmp1548/develop

inconsistent use of active class #9657

diff --cc docs/pages/menu.md
index 36d599f92aede078dd761325bd48689a1b70e4f4,614dbb00250fda538b0b1a0f5c7fb18917e966b2..76810f8c7dacdf73d8ad4da7970ffae11ef42539
--- 1/docs/pages/menu.md
--- 2/docs/pages/menu.md
+++ b/docs/pages/menu.md
@@@ -200,19 -147,11 +200,19 @@@ Add a new menu inside the `<li>` of a M
  
  ## Active State
  
- Add the class `.active` to any `<li>` to create an active state. You could apply this server-side to mark the active page, or dynamically with JavaScript.
+ Add the class `.is-active` to any `<li>` to create an active state. You could apply this server-side to mark the active page, or dynamically with JavaScript.
  
 +<p>
 +  <a class="" data-open-video="8:18"><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/IamManchanda/pen/XRYrKp?editors=1000" target="_blank"><img src="{{root}}assets/img/logos/edit-in-browser.svg" class="" height="" width="" alt="edit on codepen button"></a>
 +</div>
 +
  ```html_example
  <ul class="menu">
-   <li class="active"><a>Home</a></li>
+   <li class="is-active"><a>Home</a></li>
    <li><a>About</a></li>
    <li><a>Nachos</a></li>
  </ul>

diff --cc js/foundation.magellan.js
Simple merge