Upgrade to bootstrap v4.6.1, using CDN bootstrap for now (many things broken)

[ndcode_site.git] / navbar.jst

diff --git a/navbar.jst b/navbar.jst
index 076b59d..69e15cc 100644 (file)
--- a/navbar.jst
+++ b/navbar.jst
@@ -74,14 +74,21 @@ return async (env, head, body, scripts) => {
               //}
               //p {}
 
-              form(action="/search/index.html") {
-                div.input-group {
-                  input.form-control(name="query" type="text" placeholder="Search") {}
-                  span.input-group-btn {
-                    button.btn.btn-default(type="submit") {
-                      _out.push(icon_search_mono)
-                    }
-                  }
+              //form(action="/search/index.html") {
+              //  div.input-group {
+              //    input.form-control(name="query" type="text" placeholder="Search") {}
+              //    span.input-group-btn {
+              //      button.btn.btn-default(type="submit") {
+              //        _out.push(icon_search_mono)
+              //      }
+              //    }
+              //  }
+              //}
+              form.form-inline.'my-2'.my-lg-0(action="/search/index.html") {
+                input.form-control.mr-sm-2(name="query" type="text" placeholder="Search" aria-label="Search") {}
+                ' '
+                button.btn.btn-outline-success.'my-2'.my-sm-0(type="submit") {
+                  'Search'
                 }
               }
             }
@@ -103,57 +110,69 @@ return async (env, head, body, scripts) => {
           }
         }
       }
-      nav.navbar.navbar-default(style="margin-top: 0px; margin-bottom: 0px;") {
-        div(style="padding-left: calc(100vw - 100%);") {
-          div.container { //-fluid") {
-            //  Brand and toggle get grouped for better mobile display
-            div.navbar-header {
-              button.navbar-toggle.collapsed(type="button" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false") {
-                span.sr-only {'Toggle navigation'}
-                span.icon-bar {}
-                span.icon-bar {}
-                span.icon-bar {}
-              }
-              //a.navbar-brand(href="#") {'Brand'}
-            }
-
-            //  Collect the nav links, forms, and other content for toggling
-            div.collapse.navbar-collapse#bs-example-navbar-collapse-1 {
-              ul.nav.navbar-nav {
-                if (dir.length === 0)
-                  li.active {
-                    a(href="/index.html") {
-                      'Home'
-                      span.sr-only {'(current)'}
-                    }
-                  }
-                else
-                  li {
-                    a(href="/index.html") {
-                      'Home'
-                    }
+      nav.navbar.navbar-expand-lg.navbar-light.bg-light {
+        div.container { //div(style="padding-left: calc(100vw - 100%);") {
+          //a.navbar-brand(href="#") {'Navbar'}
+          //' '
+          button.navbar-toggler(type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation") {
+            span.navbar-toggler-icon {}
+          }
+          div.collapse.navbar-collapse#navbarSupportedContent {
+            ul.navbar-nav.mr-auto {
+              if (dir.length === 0)
+                li.nav-item.active {
+                  a.nav-link(href="/index.html") {
+                    'Home'
+                    span.sr-only {' (current)'}
                   }
-                let entries = menu.entries
-                for (let i = 0; i < entries.length; ++i)
-                  if (entries[i].navbar)
-                    if (entries[i].dir === dir)
-                      li.active {
-                        a(href=`/${entries[i].dir}/index.html`) {
-                          `${entries[i].name}`
-                          span.sr-only {'(current)'}
-                        }
+                }
+              else
+                li.nav-item {
+                  a.nav-link(href="/index.html") {'Home'}
+                }
+              let entries = menu.entries
+              for (let i = 0; i < entries.length; ++i)
+                if (entries[i].navbar)
+                  if (entries[i].dir === dir)
+                    li.nav-item.active {
+                      a.nav-link(href=`/${entries[i].dir}/index.html`) {
+                        `${entries[i].name}`
+                        span.sr-only {' (current)'}
                       }
-                    else
-                      li {
-                        a(href=`/${entries[i].dir}/index.html`) {
-                          `${entries[i].name}`
-                        }
+                    }
+                  else
+                    li.nav-item {
+                      a.nav-link(href=`/${entries[i].dir}/index.html`) {
+                        `${entries[i].name}`
                       }
-              }
-              ul.nav.navbar-nav.navbar-right {
-                li {
-                  a#give-feedback(href="") {'Give feedback'}
-                }
+                    }
+              //li.nav-item.dropdown {
+              //  a.nav-link.dropdown-toggle#navbarDropdown(href="#" role="button" data-toggle="dropdown" aria-expanded="false") {
+              //    'Dropdown'
+              //  }
+              //  div.dropdown-menu(aria-labelledby="navbarDropdown") {
+              //    a.dropdown-item(href="#") {
+              //      'Action'
+              //    }
+              //    ' '
+              //    a.dropdown-item(href="#") {
+              //      'Another action'
+              //    }
+              //    div.dropdown-divider {}
+              //    a.dropdown-item(href="#") {
+              //      'Something else here'
+              //    }
+              //  }
+              //}
+              //li.nav-item {
+              //  a.nav-link.disabled {
+              //    'Disabled'
+              //  }
+              //}
+            }
+            ul.navbar-nav.ml-auto {
+              li.nav-item {
+                a.nav-link#give-feedback(href="") {'Give feedback'}
               }
             }
           }