@internetarchive/ia-topnav 1.3.0 → 1.3.1-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-topnav",
-  "version": "1.3.0",
+  "version": "1.3.1-alpha2",
   "description": "Top nav for Internet Archive",
   "license": "AGPL-3.0-only",
   "main": "index.js",

package/src/assets/img/icon-hamburger.js

@@ -0,0 +1,18 @@
+import { html } from 'https://offshoot.prod.archive.org/lit.js';
+
+export default html`
+  <svg
+    viewBox="0 0 40 40"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby="hamburgerTitleID"
+  >
+    <title id="hamburgerTitleID">Hamburger icon</title>
+    <path
+      d="m30.5 26.5c.8284271 0 1.5.6715729 1.5 1.5s-.6715729 1.5-1.5 1.5h-21c-.82842712 0-1.5-.6715729-1.5-1.5s.67157288-1.5 1.5-1.5zm0-8c.8284271 0 1.5.6715729 1.5 1.5s-.6715729 1.5-1.5 1.5h-21c-.82842712 0-1.5-.6715729-1.5-1.5s.67157288-1.5 1.5-1.5zm0-8c.8284271 0 1.5.6715729 1.5 1.5s-.6715729 1.5-1.5 1.5h-21c-.82842712 0-1.5-.6715729-1.5-1.5s.67157288-1.5 1.5-1.5z"
+      fill="#999"
+      fill-rule="evenodd"
+    />
+  </svg>
+`;
+
+

package/src/assets/img/icons.js

@@ -1,5 +1,6 @@
 import audio from './icon-audio.js';
 import close from './icon-close.js';
+import hamburger from './icon-hamburger.js';
 import donate from './icon-donate.js';
 import ellipses from './icon-ellipses.js';
 import iaLogo from './icon-ia-logo.js';
@@ -16,6 +17,7 @@ import web from './icon-web.js';
 export default {
   audio,
   close,
+  hamburger,
   donate,
   ellipses,
   iaLogo,

package/src/ia-topnav.js

@@ -86,6 +86,13 @@ export default class IATopNav extends LitElement {
     }
   }
 
+  firstUpdated() {
+    // close open menu on `esc` click 
+    document.addEventListener('keydown', e => {
+      if (e.key === 'Escape') this.closeMenus();
+    }, false);
+  }
+
   menuSetup() {
     this.localLinks = this.getAttribute('localLinks') !== 'false' && this.getAttribute('localLinks') !== false;
     this.username = this.getAttribute('username')

package/src/primary-nav.js

@@ -1,7 +1,6 @@
 import { html, nothing } from 'https://offshoot.prod.archive.org/lit.js';
 import TrackedElement from './tracked-element.js';
 import icons from './assets/img/icons.js';
-import './assets/img/hamburger.js';
 import './login-button.js';
 import './nav-search.js';
 import './media-menu.js';
@@ -124,7 +123,7 @@ class PrimaryNav extends TrackedElement {
 
     return html`
       <button
-        class="search-trigger"
+        class="mobile-search-trigger"
         @click="${this.toggleSearchMenu}"
         data-event-click-tracking="${this.config.eventCategory}|NavSearchOpen"
       >
@@ -145,14 +144,25 @@ class PrimaryNav extends TrackedElement {
   get mobileDonateHeart() {
     return html`
       <a class="mobile-donate-link" href=${formatUrl('/donate/?origin=iawww-mbhrt', this.baseHost)}>
-        <span class="icon">
         ${icons.donate}
-      </span>
-      <span class="label">"Donate to the archive"</span>
+        <span class="sr-only">"Donate to the archive"</span>
       </a>
     `;
   }
 
+  get uploadButtonTemplate() {
+    return html`<a href="${formatUrl('/create', this.baseHost)}" class="upload">
+      ${icons.upload}
+      <span>Upload</span>
+    </a>`;
+  }
+
+  get userStateTemplate() {
+    return html`<div class="user-info">
+      ${this.username ? this.userIcon : this.loginIcon}
+    </div>`;
+  }
+
   get secondLogoSlot() {
     return this.allowSecondaryIcon
       ? html`
@@ -181,14 +191,12 @@ class PrimaryNav extends TrackedElement {
           >
           ${this.secondLogoSlot}
         </div>
-        ${this.mobileDonateHeart}
-        ${this.searchMenu}
-        <a href="${formatUrl('/create', this.baseHost)}" class="upload">
-          ${icons.upload}
-          <span>Upload</span>
-        </a>
-        <div class="user-info">
-          ${this.username ? this.userIcon : this.loginIcon}
+
+        <div class="right-side-section">
+          ${this.mobileDonateHeart}
+          ${this.searchMenu}
+          ${this.uploadButtonTemplate}
+          ${this.userStateTemplate}
         </div>
         <media-menu
           .baseHost=${this.baseHost}
@@ -205,7 +213,7 @@ class PrimaryNav extends TrackedElement {
           data-event-click-tracking="${this.config.eventCategory}|NavHamburger"
           title="Open main menu"
         >
-          <icon-hamburger ?active=${this.openMenu === 'media'}></icon-hamburger>
+          ${this.openMenu === 'media' ? icons.close : icons.hamburger}
         </button>
       </nav>
     `;

package/src/styles/desktop-subnav.js

@@ -29,9 +29,9 @@ export default css`
   }
 
   .donate svg {
-    width: 16px;
-    height: 16px;
-    vertical-align: -4px;
+    width: 1.6rem;
+    height: 1.6rem;
+    vertical-align: top;
     fill: #f00;
   }
 `;

package/src/styles/ia-topnav.js

@@ -54,7 +54,6 @@ export default css`
     --savePageErrorText: var(--errorYellow);
 
     color: var(--primaryTextColor);
-    font-size: 2rem;
     font-family: var(--themeFontFamily);
   }
 
@@ -69,7 +68,7 @@ export default css`
     right: 0;
     bottom: 0;
     left: 0;
-    z-index: 0;
+    z-index: 3;
   }
   #close-layer.visible {
     display: block;
@@ -77,7 +76,7 @@ export default css`
 
   .topnav {
     position: relative;
-    z-index: 3;
+    z-index: 4;
   }
 
   @media (max-width: 889px) {

package/src/styles/login-button.js

@@ -4,13 +4,16 @@ export default css`
   .dropdown-toggle {
     display: block;
     height: 4rem;
-    font-size: 1.6rem;
     text-transform: uppercase;
-    text-decoration: none;
     color: var(--grey80);
     cursor: pointer;
   }
 
+  .dropdown-toggle svg {
+    height: 4rem;
+    width: 4rem;
+  }
+
   .dropdown-toggle .fill-color {
     fill: var(--iconFill);
   }
@@ -50,7 +53,7 @@ export default css`
 
   @media (min-width: 890px) {
     .logged-out-toolbar {
-      transform: translateY(-.5rem);
+      padding: 0.5rem;
     }
 
     .active {

package/src/styles/media-button.js

@@ -33,8 +33,6 @@ export default css`
 
   .menu-item > .icon {
     display: inline-flex;
-    width: 42px;
-    height: 42px;
     vertical-align: middle;
     -webkit-box-align: center;
     -ms-flex-align: center;
@@ -44,6 +42,11 @@ export default css`
     justify-content: center;
   }
 
+  .menu-item > .icon > svg {
+    height: 4rem;
+    width: 4rem;
+  }
+
   .menu-item.selected .icon {
     background-color: var(--activeButtonBg);
     border-radius: 1rem 0 0 1rem;
@@ -61,7 +64,7 @@ export default css`
     fill: #f00;
   }
 
-  @media (min-width: 890px) {
+  @media (min-width: 55.62rem) {
     .menu-item {
       width: auto;
       height: 5rem;
@@ -91,7 +94,6 @@ export default css`
       color: inherit;
     }
 
-
     .web:after {
       display: none;
       content: "web";
@@ -140,7 +142,7 @@ export default css`
     }
   }
 
-  @media (min-width: 1300px) {
+  @media (min-width: 81.25rem) {
     .label,
     .web:after {
       display: inline;

package/src/styles/media-menu.js

@@ -54,9 +54,9 @@ export default css`
   }
 
   /* Desktop view styles */
-  @media (min-width: 890px) {
+  @media (min-width: 55.625rem) {
     .media-menu-inner {
-      display: inline-block;
+      display: block;
       position: static;
       width: auto;
       height: 5rem;

package/src/styles/nav-search.js

@@ -24,8 +24,6 @@ export default css`
   }
   .search svg {
     position: relative;
-    top: -5px;
-    right: -3px;
     fill: var(--activeSearchColor);
   }
   .search-activated {
@@ -65,6 +63,10 @@ export default css`
     -ms-grid-row-align: center;
     align-self: center;
   }
+  .search-activated .search svg {
+    height: 3rem;
+    width: 3rem;
+  }
   .search-activated .search-field {
     width: 100%;
     height: 100%;
@@ -93,8 +95,8 @@ export default css`
   @media (min-width: 890px) {
     .search svg {
       display: inline;
-      width: 28px;
-      height: 28px;
+      width: 2.8rem;
+      height: 2.8rem;
       vertical-align: -14px;
     }
     .search path {
@@ -105,7 +107,7 @@ export default css`
     .search-activated {
       display: block;
       position: static;
-      padding: 1.2rem 0.2rem;
+      padding: 1.1rem 0.2rem;
       background: transparent;
     }
 
@@ -127,8 +129,8 @@ export default css`
     }
 
     .search-activated .search svg {
-      width: 28px;
-      height: 28px;
+      width: 2.8rem;
+      height: 2.8rem;
     }
   }
 `;

package/src/styles/primary-nav.js

@@ -11,10 +11,10 @@ export default css`
     position: relative;
     display: -ms-grid;
     display: grid;
-    height: 40px;
+    height: 4rem;
     grid-template-areas: 'hamburger empty heart search user';
-    -ms-grid-columns: 40px minmax(1rem, 100%) 40px 40px 40px;
-    grid-template-columns: 40px auto 40px 40px 40px;
+    -ms-grid-columns: 4rem minmax(1rem, 100%) 4rem 4rem 4rem;
+    grid-template-columns: 4rem auto 5rem 4rem 4rem;
     -ms-grid-rows: 100%;
     grid-template-rows: 100%;
     background: var(--primaryNavBg);
@@ -23,10 +23,15 @@ export default css`
 
   nav.hide-search {
     grid-template-areas: 'hamburger empty heart user';
-    -ms-grid-columns: 40px minmax(1rem, 100%) 40px 40px;
-    grid-template-columns: 40px auto 40px 40px;
+    -ms-grid-columns: 4rem minmax(1rem, 100%) 4rem 4rem;
+    grid-template-columns: 4rem auto 5rem 4rem;
   }
 
+  .right-side-section {
+    display: flex;
+    user-select: none;
+    align-items: center;
+  }
   button {
     background: none;
     color: inherit;
@@ -56,6 +61,14 @@ export default css`
     grid-column-end: user-end;
   }
 
+  .ia-logo {
+    height: 3rem;
+    width: 3rem;
+  }
+  .ia-wordmark {
+    height: 3rem;
+    width: 9.5rem;
+  }
   .ia-logo,
   .ia-wordmark {
     margin-right: 5px;
@@ -67,55 +80,39 @@ export default css`
     grid-area: hamburger;
     padding: 0;
   }
-
-  .mobile-donate-link {
-    -ms-grid-row: 1;
-    -ms-grid-column: 3;
-    grid-area: heart;
-    position: relative;
-    padding: 0;
-    z-index: 1;
-    width: 100%;
-    text-align: right;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
+  .hamburger svg {
+    height: 4rem;
+    width: 4rem;
+    fill: var(--activeColor);
   }
+
   .mobile-donate-link svg {
-    height: 50px;
-    width: 50px;
-    margin-top: -5px;
-    margin-left: -5px;
+    height: 5rem;
+    width: 5rem;
   }
   .mobile-donate-link .fill-color {
     fill: rgb(255, 0, 0);
   }
-  .mobile-donate-link .label {
+
+  .sr-only {
     position: absolute;
     width: 1px;
     height: 1px;
-    padding: 0;
     margin: -1px;
-    overflow: hidden;
-    clip: rect(0,0,0,0);
+    padding: 0;
     border: 0;
+    overflow: hidden;
+    white-space: nowrap;
+    clip: rect(1px, 1px, 1px, 1px);
+    -webkit-clip-path: inset(50%);
+    clip-path: inset(50%);
+    user-select: none;
   }
 
-.search-trigger {
-    -ms-grid-row: 1;
-    -ms-grid-column: 4;
-    grid-area: search;
-    position: relative;
+  .mobile-search-trigger {
     padding: 0;
-    z-index: 1;
-    width: 100%;
-    text-align: right;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
   }
-
-  .search-trigger .fill-color {
+  .mobile-search-trigger .fill-color {
     fill: var(--iconFill);
   }
 
@@ -132,14 +129,9 @@ export default css`
     display: none;
   }
 
-  .user-info {
-    -ms-grid-row: 1;
-    -ms-grid-column: 5;
-    grid-area: user;
-    -ms-grid-row-align: stretch;
-    align-self: stretch;
-    -ms-grid-column-align: end;
-    justify-self: end;
+  .upload svg {
+    height: 3rem;
+    width: 3rem; 
   }
 
   .screen-name {
@@ -150,9 +142,8 @@ export default css`
   }
 
   .user-menu {
-    height: 100%;
-    padding: 0.5rem 1rem;
     color: var(--lightTextColor);
+    padding: 0.5rem;
   }
 
   .user-menu:hover {
@@ -166,8 +157,8 @@ export default css`
 
   .user-menu img {
     display: block;
-    width: 30px;
-    height: 30px;
+    width: 3rem;
+    height: 3rem;
   }
 
   .link-home {
@@ -195,8 +186,12 @@ export default css`
 
   @media (min-width: 890px) {
     :host {
-      --userIconWidth: 32px;
-      --userIconHeight: 32px;
+      --userIconWidth: 3.2rem;
+      --userIconHeight: 3.2rem;
+    }
+
+    .right-side-section {
+      display: contents;
     }
 
     nav {
@@ -220,18 +215,23 @@ export default css`
     }
 
     .hamburger,
-    .search-trigger,
+    .mobile-search-trigger,
     .mobile-donate-link {
       display: none;
     }
 
     .user-info {
       float: right;
-      padding-top: 1rem;
+    }
+
+    .user-info .user-menu img {
+      height: 3rem;
+      width: 3rem;
+      margin-right: 0.5rem;
     }
 
     .user-menu {
-      padding-top: 0;
+      padding: 1rem;
     }
 
     .user-menu.active {
@@ -241,12 +241,13 @@ export default css`
     .user-menu img {
       display: inline-block;
       vertical-align: middle;
+      margin-right: 0.5rem;
     }
 
     .upload {
       display: block;
+      padding: 1rem 0.5rem;
       float: right;
-      margin-top: 1rem;
       font-size: 1.4rem;
       text-transform: uppercase;
       text-decoration: none;
@@ -259,8 +260,6 @@ export default css`
     }
 
     .upload svg {
-      width: 32px;
-      height: 32px;
       vertical-align: middle;
       fill: var(--iconFill);
     }

package/src/styles/signed-out-dropdown.js

@@ -5,7 +5,7 @@ export default css`
     .initial,
     .closed,
     .open {
-      right: 34rem;
+      right: 35rem;
     }
 
     .search-hidden.initial,
@@ -19,13 +19,13 @@ export default css`
     .initial,
     .closed,
     .open {
-      right: 40rem;
+      right: 41rem;
     }
 
     .search-hidden.initial,
     .search-hidden.closed,
     .search-hidden.open {
-      right: 24.5rem;
+      right: 26rem;
     }
   }
 `;

package/src/styles/user-menu.js

@@ -5,7 +5,7 @@ export default css`
     .initial,
     .closed,
     .open {
-      right: 21.3rem;
+      right: 22.4rem;
     }
 
     .search-hidden.initial,
@@ -19,7 +19,7 @@ export default css`
     .initial,
     .closed,
     .open {
-      right: 27.5rem;
+      right: 27.2rem;
     }
 
     .search-hidden.initial,

package/test/ia-topnav.test.js

@@ -198,7 +198,7 @@ describe('<ia-topnav>', () => {
 
   it('toggles search menu when search toggle button clicked', async () => {
     const el = await fixture(container());
-    el.shadowRoot.querySelector('primary-nav').shadowRoot.querySelector('.search-trigger').click();
+    el.shadowRoot.querySelector('primary-nav').shadowRoot.querySelector('.mobile-search-trigger').click();
     await el.updateComplete;
 
     expect(el.openMenu).to.equal('search');

package/test/primary-nav.test.js

@@ -40,7 +40,7 @@ describe('<primary-nav>', () => {
       hideSearch: true,
     }));
 
-    expect(el.shadowRoot.querySelector('.search-trigger')).to.equal(null);
+    expect(el.shadowRoot.querySelector('.mobile-search-trigger')).to.equal(null);
     expect(el.shadowRoot.querySelector('nav-search')).to.equal(null);
   });
 

package/src/assets/img/hamburger.js

@@ -1,36 +0,0 @@
-import { html, css } from 'https://offshoot.prod.archive.org/lit.js';
-import Icon from './icon.js';
-import icons from './icons.js';
-
-class HamBurger extends Icon {
-  static get styles() {
-    return css`
-      svg {
-        display: block;
-      }
-      .fill-color {
-        fill: var(--activeColor);
-      }
-    `;
-  }
-
-  static get closed() {
-    return html`
-      <svg height="40" viewBox="0 0 40 40" width="40" xmlns="http://www.w3.org/2000/svg" aria-labelledby="hamburgerTitleID hamburgerDescID">
-        <title id="hamburgerTitleID">Hamburger icon</title>
-        <desc id="hamburgerDescID">An icon used to represent a menu that can be toggled by interacting with this icon.</desc>
-        <path d="m30.5 26.5c.8284271 0 1.5.6715729 1.5 1.5s-.6715729 1.5-1.5 1.5h-21c-.82842712 0-1.5-.6715729-1.5-1.5s.67157288-1.5 1.5-1.5zm0-8c.8284271 0 1.5.6715729 1.5 1.5s-.6715729 1.5-1.5 1.5h-21c-.82842712 0-1.5-.6715729-1.5-1.5s.67157288-1.5 1.5-1.5zm0-8c.8284271 0 1.5.6715729 1.5 1.5s-.6715729 1.5-1.5 1.5h-21c-.82842712 0-1.5-.6715729-1.5-1.5s.67157288-1.5 1.5-1.5z" fill="#999" fill-rule="evenodd"/>
-      </svg>
-    `;
-  }
-
-  static get opened() {
-    return icons.close;
-  }
-
-  render() {
-    return this.active ? HamBurger.opened : HamBurger.closed;
-  }
-}
-
-customElements.define('icon-hamburger', HamBurger);

package/src/assets/img/user.js

@@ -1,38 +0,0 @@
-import { html, css } from 'https://offshoot.prod.archive.org/lit.js';
-import Icon from './icon.js';
-
-class User extends Icon {
-  static get styles() {
-    return css`
-      svg {
-        vertical-align: middle;
-        width: var(--userIconWidth);
-        height: var(--userIconHeight);
-      }
-      path {
-        fill: var(--baseColor);
-      }
-      .active {
-        fill: var(--activeColor);
-      }
-    `;
-  }
-
-  render() {
-    return html`
-      <svg
-        width="40"
-        height="40"
-        viewBox="0 0 40 40"
-        xmlns="http://www.w3.org/2000/svg"
-        aria-labelledby="userTitleID userDescID"
-      >
-        <title id="userTitleID">User icon</title>
-        <desc id="userDescID">An illustration of a person's head and chest.</desc>
-        <path class="${this.active ? 'active' : ''}" d="m20.7130435 18.0434783c-3.5658385 0-6.4565218-2.9198821-6.4565218-6.5217392 0-3.60185703 2.8906833-6.5217391 6.4565218-6.5217391s6.4565217 2.91988207 6.4565217 6.5217391c0 3.6018571-2.8906832 6.5217392-6.4565217 6.5217392zm-12.9130435 16.9565217c0-7.9240855 5.7813665-14.3478261 12.9130435-14.3478261s12.9130435 6.4237406 12.9130435 14.3478261z" fill-rule="evenodd"/>
-      </svg>
-    `;
-  }
-}
-
-customElements.define('user-image', User);