From: Jane Sandberg <js7389@princeton.edu>
Date: Mon, 13 Jun 2022 21:39:08 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=83ffadd46ac665c731b07e5de174d3810bf58d27;p=eg-antora.git

Merge remote-tracking branch 'upstream/master'
---

83ffadd46ac665c731b07e5de174d3810bf58d27
diff --cc package.json
index b1af49c,a333bf4..9505635
--- a/package.json
+++ b/package.json
@@@ -49,12 -51,7 +51,10 @@@
      "require-from-string": "~2.0",
      "stylelint": "~13.3",
      "stylelint-config-standard": "~20.0",
-     "typeface-roboto": "0.0.75",
-     "typeface-roboto-mono": "0.0.75",
      "vinyl-buffer": "~1.0",
      "vinyl-fs": "~3.0"
 +  },
 +  "scripts": {
 +    "gulp-bundle": "gulp bundle"
    }
  }
diff --cc src/css/vars.css
index 0e13383,00bcb12..90c137b
--- a/src/css/vars.css
+++ b/src/css/vars.css
@@@ -32,17 -32,19 +33,19 @@@
    --body-background: var(--color-white);
    --panel-background: var(--color-smoke-30);
    --panel-border-color: var(--color-smoke-90);
+   --scrollbar-track-color: var(--color-smoke-30);
    --scrollbar-thumb-color: var(--color-gray-10);
+   --scrollbar_hover-thumb-color: var(--color-gray-30);
    /* navbar */
 -  --navbar-background: var(--color-jet-80);
 -  --navbar-font-color: var(--color-white);
 -  --navbar_hover-background: var(--color-black);
 +  --navbar-background: var(--color-white);
 +  --navbar-font-color: var(--color-evergreen);
 +  --navbar_hover-background: var(--color-white);
    --navbar-button-background: var(--color-white);
    --navbar-button-border-color: var(--panel-border-color);
 -  --navbar-button-font-color: var(--body-font-color);
 +  --navbar-button-font-color: var(--color-evergreen);
    --navbar-menu-border-color: var(--panel-border-color);
    --navbar-menu-background: var(--color-white);
 -  --navbar-menu-font-color: var(--body-font-color);
 +  --navbar-menu-font-color: var(--color-evergreen);
    --navbar-menu_hover-background: var(--color-smoke-50);
    /* nav */
    --nav-background: var(--panel-background);
diff --cc src/partials/footer-scripts.hbs
index 9af969f,266a3ed..4ad20f7
--- a/src/partials/footer-scripts.hbs
+++ b/src/partials/footer-scripts.hbs
@@@ -1,7 -1,5 +1,10 @@@
- <script src="{{uiRootPath}}/js/site.js"></script>
+ <script src="{{{uiRootPath}}}/js/site.js"></script>
 +{{#if (eq env.DOCSEARCH_ENGINE 'lunr')}}
- <script src="{{uiRootPath}}/js/vendor/lunr.js"></script>
- <script src="{{uiRootPath}}/js/vendor/search.js" id="search-script" data-base-path="{{or siteRootPath (or site.url siteRootUrl)}}" data-page-path="{{@root.page.url}}"></script>
- <script async src="{{uiRootPath}}/../search-index.js"></script>
++<script src="{{{uiRootPath}}}/js/vendor/lunr.js"></script>
++<script src="{{{uiRootPath}}}/js/vendor/search.js" id="search-script" data-base-path="{{or siteRootPath (or site.url siteRootUrl)}}" data-page-path="{{@root.page.url}}"></script>
++<script async src="{{{uiRootPath}}}/../search-index.js"></script>
++{{/if}}
+ <script async src="{{{uiRootPath}}}/js/vendor/highlight.js"></script>
+ {{#if env.SITE_SEARCH_PROVIDER}}
+ {{> search-scripts}}
  {{/if}}
- <script async src="{{uiRootPath}}/js/vendor/highlight.js"></script>
diff --cc src/partials/header-content.hbs
index 7372935,8a094a4..e43a3ec
--- a/src/partials/header-content.hbs
+++ b/src/partials/header-content.hbs
@@@ -1,7 -1,14 +1,14 @@@
 -<header class="header">
 +<header class="header" role="banner">
    <nav class="navbar">
      <div class="navbar-brand">
-       <a class="navbar-item" href="{{{or site.url (or siteRootUrl siteRootPath)}}}">{{site.title}}</a>
+       <a class="navbar-item" href="{{{or site.url siteRootPath}}}">{{site.title}}</a>
+       {{#if env.SITE_SEARCH_PROVIDER}}
+       <div class="navbar-item search hide-for-print">
+         <div id="search-field" class="field">
+           <input id="search-input" type="text" placeholder="Search the docs"{{#if page.home}} autofocus{{/if}}>
+         </div>
+       </div>
+       {{/if}}
        <button class="navbar-burger" data-target="topbar-nav">
          <span></span>
          <span></span>
@@@ -20,29 -27,19 +27,34 @@@
            </div>
          </div>
          <div class="navbar-item has-dropdown is-hoverable">
 -          <a class="navbar-link" href="#">Services</a>
 +          <a class="navbar-link" href="#">Downloads</a>
            <div class="navbar-dropdown">
 -            <a class="navbar-item" href="#">Service A</a>
 -            <a class="navbar-item" href="#">Service B</a>
 -            <a class="navbar-item" href="#">Service C</a>
 +            <a class="navbar-item" href="https://evergreen-ils.org/trademark-policy/">Evergreen Downloads</a>
 +            <a class="navbar-item" href="https://evergreen-ils.org/opensrf-downloads/">OpenSRF Downloads</a>
 +          </div>
 +        </div>
 +        <div class="navbar-item has-dropdown is-hoverable">
 +          <a class="navbar-link" href="#">About Us</a>
 +          <div class="navbar-dropdown">
 +            <a class="navbar-item" href="https://evergreen-ils.org/about-us/">Overview</a>
 +            <a class="navbar-item" href="https://evergreen-ils.org/about-us/annual-reports/">Annual Reports</a>
 +            <a class="navbar-item" href="https://evergreen-ils.org/frequently-anticipated-questions/">F.A.Q.</a>
 +            <a class="navbar-item" href="https://evergreen-ils.org/code-of-conduct/">Evergreen Event Code of Conduct</a>
 +            <a class="navbar-item" href="https://evergreen-ils.org/governance/">Project Governance</a>
 +            <a class="navbar-item" href="https://evergreen-ils.org/trademark-policy/">Trademark Policy</a>
            </div>
          </div>
+         <div class="navbar-item">
+           <span class="control">
+             <a class="button is-primary" href="#">Download</a>
+           </span>
+         </div>
        </div>
      </div>
 +    {{#if env.DOCSEARCH_ENABLED}}
 +        <div class="navbar-item">
 +          <input id="search-input" type="text" placeholder="Search docs">
 +        </div>
 +      {{/if}}
    </nav>
  </header>