Merge pull request #564 from topaxi/fix-nav-markup

Fix nav markup, lists can only contain list-items
swiss · Nov 30, 2017 · a4a088a · a4a088a
2 parents 7bae810 + d686967
commit a4a088a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/views/layouts/includes/f-menu-item.html b/src/views/layouts/includes/f-menu-item.html
@@ -1,13 +1,13 @@
 <li class="dropdown yamm-fw">
   <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{t @key 'title'}}</a>
-  <ul class="dropdown-menu" role="menu">
+  <div class="dropdown-menu" role="menu">
     <div class="yamm-content container-fluid">
       <div class="row">
         <div class="col-sm-12"><a href="#" class="yamm-close icon icon--after icon--close pull-right" role="menuitem" tabindex="-1">{{t 'styleguide.close'}}</a></div>
       </div>
       <div class="row">
         {{#each items}}
-          <li class="col-sm-3">
+          <div class="col-sm-3">
             <div class="yamm-content container-fluid">
               <h4><a href="{{#if @root.baseurl}}{{@root.baseurl}}/{{/if}}../{{data 'locale'}}/{{#if ../path}}{{@../key}}/{{/if}}{{prefixless @key}}.html">{{t @../key @key 'title'}}</a></h4>
               <ul role="menu">
@@ -18,13 +18,13 @@ <h4><a href="{{#if @root.baseurl}}{{@root.baseurl}}/{{/if}}../{{data 'locale'}}/
                 {{/each}}
               </ul>
             </div>
-          </li>
+          </div>
           {{#modulo @index 4}}
             <div class="clearfix"></div>
           {{/modulo}}
         {{/each}}
       </div>
       <a href="#" class="yamm-close-bottom" role="menuitem" tabindex="-1"><span class="icon icon--top"></span></a>
     </div>
-  </ul>
+  </div>
 </li>
diff --git a/src/views/layouts/includes/f-menu.html b/src/views/layouts/includes/f-menu.html
@@ -77,14 +77,14 @@ <h2 class="sr-only">{{t 'styleguide.global-search.title'}}</h2>
   <ul class="nav navbar-nav">
     <li class="dropdown yamm-fw">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{t 'docs.title'}}</a>
-      <ul class="dropdown-menu" role="menu">
+      <div class="dropdown-menu" role="menu">
         <div class="yamm-content container-fluid">
           <div class="row">
             <div class="col-sm-12"><a href="#" class="yamm-close icon icon--after icon--close pull-right" role="menuitem" tabindex="-1">{{t 'styleguide.close'}}</a></div>
           </div>
           <div class="row">
             {{#each views.docs.items}}
-            <li class="col-sm-3">
+            <div class="col-sm-3">
               <div class="yamm-content container-fluid">
                 <h4><a href="{{#if @root.baseurl}}{{@root.baseurl}}/{{/if}}../{{data 'locale'}}/docs/{{@key}}.html">{{t 'docs' @key 'title'}}</a></h4>
                 <ul role="menu">
@@ -95,15 +95,15 @@ <h4><a href="{{#if @root.baseurl}}{{@root.baseurl}}/{{/if}}../{{data 'locale'}}/
                   {{/each}}
                 </ul>
               </div>
-            </li>
+            </div>
             {{#modulo @index 4}}
             <div class="clearfix"></div>
             {{/modulo}}
             {{/each}}
           </div>
           <a href="#" class="yamm-close-bottom" role="menuitem" tabindex="-1"><span class="icon icon--top"></span></a>
         </div>
-      </ul>
+      </div>
     </li>
 
     {{#each materials}}
@@ -112,14 +112,14 @@ <h4><a href="{{#if @root.baseurl}}{{@root.baseurl}}/{{/if}}../{{data 'locale'}}/
 
     <li class="dropdown yamm-fw">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{t 'pages.title'}}</a>
-      <ul class="dropdown-menu" role="menu">
+      <div class="dropdown-menu" role="menu">
         <div class="yamm-content container-fluid">
           <div class="row">
             <div class="col-sm-12"><a href="#" class="yamm-close icon icon--after icon--close pull-right" role="menuitem" tabindex="-1">{{t 'styleguide.close'}}</a></div>
           </div>
           <div class="row">
             {{#each views.pages.items}}
-            <li class="col-sm-3">
+            <div class="col-sm-3">
               <div class="yamm-content container-fluid">
                 <h4><a href="{{#if @root.baseurl}}{{@root.baseurl}}/{{/if}}../{{data 'locale'}}/pages/{{@key}}.html">{{t 'pages' @key 'title'}}</a></h4>
                 <ul role="menu">
@@ -130,15 +130,15 @@ <h4><a href="{{#if @root.baseurl}}{{@root.baseurl}}/{{/if}}../{{data 'locale'}}/
                   {{/each}}
                 </ul>
               </div>
-            </li>
+            </div>
             {{#modulo @index 4}}
             <div class="clearfix"></div>
             {{/modulo}}
             {{/each}}
           </div>
           <a href="#" class="yamm-close-bottom" role="menuitem" tabindex="-1"><span class="icon icon--top"></span></a>
         </div>
-      </ul>
+      </div>
     </li>
   </ul>
 </nav>