Fixed navbar styling

Author: davenquinn

pages/+Page.module.sass

@@ -3,11 +3,20 @@
 
 .site-header
   z-index: 1000
+  position: relative
 
 .main-title
   --macrostrat-logo-size: 100px
-  --macrostrat-wordmark-size: 3em
-  justify-content: start
+  --macrostrat-wordmark-size: 3.5rem
+  justify-content: center
+
+  .subtitle
+    font-size: 1.2rem
+    margin-top: 0.25rem
+    color: var(--secondary-color)
+    margin-bottom: 0.5rem
+
+  gap: 1rem !important
 
 .site-navbar
   :global(.navbar-title)

pages/+Page.ts

@@ -14,7 +14,7 @@ export function Page() {
   return h("div.page-main", [
     h("header.site-header", [
       h(SiteTitle, { className: "main-title" }, [
-        //h("h2.subtitle", "The data system for the crust"),
+        h("h2.subtitle", "The data system for the crust"),
       ]),
     ]),
     h(Navbar, { className: "site-navbar" }),

pages/dev/lexicon/+Page.mdx

@@ -1,5 +1,3 @@
-import { PageHeader } from "~/components";
-import { PageBreadcrumbs } from "~/components";
 import "./main.styl";
 import { Image } from "./index";
 import { MacrostratIcon } from "~/components";

pages/map/map-interface/components/navbar/index.ts

@@ -13,7 +13,9 @@ import { PanelSubhead } from "@macrostrat/map-interface";
 import classNames from "classnames";
 import { navigate } from "vike/client/router";
 import { MacrostratIcon } from "~/components/macrostrat-icon";
-import { useAdmoinshments } from "#/map/map-interface/components/filter-panel/admonishments";
+import { useAdmoinshments } from "../filter-panel/admonishments";
+import { MacrostatLogoLink } from "~/components/general";
+import { useInDarkMode } from "@macrostrat/ui-components";
 
 const h = hyper.styled(styles);
 
@@ -146,22 +148,26 @@ function Searchbar({ className }) {
     filterPanelElement = h(FilterPanel, { filters, admonishments });
   }
 
-  return h(FloatingNavbar, { statusElement: filterPanelElement }, [
-    h(MacrostratIcon, {
-      size: 36,
-      onClick() {
-        navigate("/");
-      },
-    }),
-    h(InputGroup, {
-      large: true,
-      onChange: handleSearchInput,
-      onClick: gainInputFocus,
-      rightElement: h(MenuButton),
-      placeholder: "Search Macrostrat...",
-      value: term,
-    }),
-  ]);
+  return h(
+    FloatingNavbar,
+    { statusElement: filterPanelElement, className: "map-navbar" },
+    [
+      h("div.navbar-link-container", [
+        h(MacrostatLogoLink, {
+          logoStyle: "frameless-simple",
+          className: "navbar-logo",
+        }),
+      ]),
+      h(InputGroup, {
+        large: true,
+        onChange: handleSearchInput,
+        onClick: gainInputFocus,
+        rightElement: h(MenuButton),
+        placeholder: "Search Macrostrat...",
+        value: term,
+      }),
+    ]
+  );
 }
 
 function SearchGuidance() {

pages/map/map-interface/components/navbar/navbar.module.sass

@@ -45,3 +45,15 @@
         content: '–'
         position: absolute
         left: -1em
+
+.map-navbar :global(.bp5-navbar)
+  overflow: hidden
+
+.navbar-logo
+  //margin: -8px -15px -8px -15px
+  //margin-right: -10px
+  border: 1px solid var(--panel-rule-color)
+  --macrostrat-logo-size: 50px
+
+.navbar-link-container
+  margin-left: -10px