Fixing conflict in merge

diff --cc doc/pages/components/offcanvas.html
index 1f46b94d2962688770b77ea38c0e9fc9730b3c66,094f80b10964d615e2f5639709ffe2944b4496e4..b75ee313083a42e4d91fc1e3e2ba0ec7bad41993
--- 1/doc/pages/components/offcanvas.html
--- 2/doc/pages/components/offcanvas.html
+++ b/doc/pages/components/offcanvas.html
@@@ -142,12 -142,12 +142,13 @@@ Now put it all together..
  
  ```html
  <nav class="tab-bar">
-   <section class="left-small">
-     <a href="#idOfLeftMenu" role="button" aria-expanded="false" class="left-off-canvas-toggle menu-icon" ><span></span></a>
-   </section>
-   <section class="right-small">
-     <a href="#idOfRightMenu" role="button" aria-expanded="false" class="right-off-canvas-toggle menu-icon" ><span></span></a>
-   </section>
++
+   <div class="left-small">
+     <a href="#idOfLeftMenu" role="button" aria-controls="idOfLeftMenu" aria-expanded="false" class="left-off-canvas-toggle menu-icon" ><span></span></a>
+   </div>
+   <div class="right-small">
+     <a href="#idOfRightMenu" role="button" aria-controls="idOfRightMenu" aria-expanded="false" class="right-off-canvas-toggle menu-icon" ><span></span></a>
+   </div>
  </nav>
  ```
  ...and here's what you'll get: