From 67eb2cbae4593bc87a80cc6c04ea6863a41ffb97 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 18 Dec 2019 12:55:38 +0800
Subject: [PATCH] MDL-67544 theme: Ensure that search box is in valid li

---
 theme/boost/templates/navbar-secure.mustache   | 2 +-
 theme/boost/templates/navbar.mustache          | 8 ++++----
 theme/classic/templates/navbar-secure.mustache | 4 ++--
 theme/classic/templates/navbar.mustache        | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/theme/boost/templates/navbar-secure.mustache b/theme/boost/templates/navbar-secure.mustache
index 45f88be8103..7b0ae6db5b1 100644
--- a/theme/boost/templates/navbar-secure.mustache
+++ b/theme/boost/templates/navbar-secure.mustache
@@ -28,7 +28,7 @@
 
         <ul class="nav navbar-nav ml-auto">
             <li class="nav-item">
-            {{{ output.secure_login_info }}}
+                {{{ output.secure_login_info }}}
             </li>
         </ul>
 </nav>
diff --git a/theme/boost/templates/navbar.mustache b/theme/boost/templates/navbar.mustache
index 491d350dd32..e3067d9bc81 100644
--- a/theme/boost/templates/navbar.mustache
+++ b/theme/boost/templates/navbar.mustache
@@ -43,12 +43,12 @@
             {{{ output.page_heading_menu }}}
         </ul>
         <ul class="nav navbar-nav ml-auto">
-            <div class="d-none d-lg-block">
-            {{{ output.search_box }}}
-        </div>
+            <li class="d-none d-lg-block">
+                {{{ output.search_box }}}
+            </li>
             <!-- navbar_plugin_output -->
             <li class="nav-item">
-            {{{ output.navbar_plugin_output }}}
+                {{{ output.navbar_plugin_output }}}
             </li>
             <!-- user_menu -->
             <li class="nav-item d-flex align-items-center">
diff --git a/theme/classic/templates/navbar-secure.mustache b/theme/classic/templates/navbar-secure.mustache
index 55dd58a3a70..3dc50c4098f 100644
--- a/theme/classic/templates/navbar-secure.mustache
+++ b/theme/classic/templates/navbar-secure.mustache
@@ -39,7 +39,7 @@
 
     <ul class="nav navbar-nav ml-auto">
         <li class="nav-item">
-        {{{ output.secure_login_info }}}
+            {{{ output.secure_login_info }}}
         </li>
     </ul>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/theme/classic/templates/navbar.mustache b/theme/classic/templates/navbar.mustache
index 41e011ed550..c5cd4ab07f7 100644
--- a/theme/classic/templates/navbar.mustache
+++ b/theme/classic/templates/navbar.mustache
@@ -58,12 +58,12 @@
             {{{ output.page_heading_menu }}}
         </ul>
         <ul class="nav navbar-nav ml-auto">
-            <div class="d-none d-lg-block">
-            {{{ output.search_box }}}
-        </div>
+            <li class="d-none d-lg-block">
+                {{{ output.search_box }}}
+            </li>
             <!-- navbar_plugin_output -->
             <li class="nav-item">
-            {{{ output.navbar_plugin_output }}}
+                {{{ output.navbar_plugin_output }}}
             </li>
             <!-- user_menu -->
             <li class="nav-item d-flex align-items-center">