@internetarchive/ia-topnav 1.2.2-alpha2 → 1.2.2-alpha4

package/package.json

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

package/src/assets/img/hamburger.js

@@ -7,6 +7,8 @@ class HamBurger extends Icon {
     return css`
       svg {
         display: block;
+        height: 4rem;
+        width: 4rem;
       }
       .fill-color {
         fill: var(--activeColor);

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

@@ -0,0 +1,17 @@
+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 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>
+`;
+
+

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';
@@ -8,7 +9,6 @@ import search from './icon-search.js';
 import software from './icon-software.js';
 import texts from './icon-texts.js';
 import upload from './icon-upload.js';
-import uploadUnpadded from './icon-upload-unpadded.js';
 import user from './icon-user.js';
 import video from './icon-video.js';
 import web from './icon-web.js';
@@ -16,6 +16,7 @@ import web from './icon-web.js';
 export default {
   audio,
   close,
+  hamburger,
   donate,
   ellipses,
   iaLogo,
@@ -24,7 +25,6 @@ export default {
   software,
   texts,
   upload,
-  uploadUnpadded,
   user,
   video,
   web,

package/src/data/menus.js

@@ -524,7 +524,6 @@ export function buildTopNavMenus(userid = '___USERID___', localLinks = true, way
         url: `${prefix}/create`,
         title: 'Upload files',
         analyticsEvent: 'UserUpload',
-        class: 'mobile-upload',
       },
       {
         url: `${prefix}/details/@${userid}`,

package/src/dropdown-menu.js

@@ -1,9 +1,7 @@
 import { html, nothing } from 'https://offshoot.prod.archive.org/lit.js';
-import { ifDefined } from 'https://offshoot.prod.archive.org/lit/directives/if-defined.js';
 import TrackedElement from './tracked-element.js';
 import dropdownMenuCSS from './styles/dropdown-menu.js';
 import formatUrl from './lib/formatUrl.js';
-import icons from './assets/img/icons.js';
 
 class DropdownMenu extends TrackedElement {
   static get styles() {
@@ -57,11 +55,9 @@ class DropdownMenu extends TrackedElement {
     const calloutText = this.config.callouts?.[link.title];
     return html`<a
       href="${formatUrl(link.url, this.baseHost)}"
-      class="${ifDefined(link.class)}"
       @click=${this.trackClick}
       data-event-click-tracking="${this.config.eventCategory}|Nav${link.analyticsEvent}"
       aria-label=${calloutText ? `New feature: ${link.title}` : nothing}>
-        ${link.class === 'mobile-upload' ? icons.uploadUnpadded : nothing}
         ${link.title}
         ${calloutText ? html`<span class="callout" aria-hidden="true">${calloutText}</span>` : nothing}
     </a>`;

package/src/primary-nav.js

@@ -124,7 +124,7 @@ class PrimaryNav extends TrackedElement {
 
     return html`
       <button
-        class="search-trigger"
+        class="mobile-search-trigger right-side-item"
         @click="${this.toggleSearchMenu}"
         data-event-click-tracking="${this.config.eventCategory}|NavSearchOpen"
       >
@@ -144,15 +144,26 @@ class PrimaryNav extends TrackedElement {
 
   get mobileDonateHeart() {
     return html`
-      <a class="mobile-donate-link" href=${formatUrl('/donate/?origin=iawww-mbhrt', this.baseHost)}>
-        <span class="icon">
+      <a class="mobile-donate-link right-side-item" href=${formatUrl('/donate/?origin=iawww-mbhrt', this.baseHost)}>
         ${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 right-side-item">
+      ${icons.upload}
+      <span>Upload</span>
+    </a>`;
+  }
+
+  get userStateTemplate() {
+    return html`<div class="user-info right-side-item">
+      ${this.username ? this.userIcon : this.loginIcon}
+    </div>`;
+  }
+
   get secondLogoSlot() {
     return this.allowSecondaryIcon
       ? html`
@@ -181,14 +192,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 +214,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/base.js

@@ -20,7 +20,7 @@ export const subnavListCSS = css`
     padding-top: 1.5rem;
   }
 
-  @media (min-width: 890px) {
+  @media (min-width: 89rem) {
     h4 {
       margin: 0 0 1rem 0;
       font-weight: 100;

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/dropdown-menu.js

@@ -78,16 +78,6 @@ export default css`
     font-weight: bold;
   }
 
-  a.mobile-upload {
-    display: flex;
-    justify-content: left;
-    align-items: center;
-  }  
-  a.mobile-upload svg {
-    fill: #fff;
-    margin-right: 10px;
-  }
-
   @media (min-width: 890px) {
     nav {
       overflow: visible;
@@ -156,9 +146,5 @@ export default css`
       opacity: 1;
       overflow: visible;
     }
-
-    a.mobile-upload {
-      display: none;
-    }
   }
 `;

package/src/styles/login-button.js

@@ -3,14 +3,16 @@ import { css } from 'https://offshoot.prod.archive.org/lit.js';
 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);
   }
@@ -49,10 +51,6 @@ export default css`
   }
 
   @media (min-width: 890px) {
-    .logged-out-toolbar {
-      transform: translateY(-.5rem);
-    }
-
     .active {
       background: transparent;
     }

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,9 @@ export default css`
     position: relative;
     display: -ms-grid;
     display: grid;
-    height: 40px;
     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 4rem 4rem 4rem;
     -ms-grid-rows: 100%;
     grid-template-rows: 100%;
     background: var(--primaryNavBg);
@@ -23,10 +22,24 @@ 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 4rem 4rem;
   }
 
+  .right-side-section {
+    display: flex;
+    user-select: none;
+    align-items: center;
+  }
+  .right-side-item {
+    position: static;
+    padding: 0;
+    background: transparent;
+  }
+  .right-side-item svg {
+    height: 4rem;
+    width: 4rem;
+  }
   button {
     background: none;
     color: inherit;
@@ -56,6 +69,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 +88,32 @@ 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;
-  }
-  .mobile-donate-link svg {
-    height: 50px;
-    width: 50px;
-    margin-top: -5px;
-    margin-left: -5px;
+  .hamburger svg {
+    height: 4rem;
+    width: 4rem;
+    fill: var(--activeColor);
   }
+
   .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);
-    border: 0;
-  }
-
-.search-trigger {
-    -ms-grid-row: 1;
-    -ms-grid-column: 4;
-    grid-area: search;
-    position: relative;
     padding: 0;
-    z-index: 1;
-    width: 100%;
-    text-align: right;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
+    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 .fill-color {
+  .mobile-search-trigger .fill-color {
     fill: var(--iconFill);
   }
 
@@ -132,14 +130,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 +143,8 @@ export default css`
   }
 
   .user-menu {
-    height: 100%;
-    padding: 0.5rem 1rem;
     color: var(--lightTextColor);
+    padding: 0;
   }
 
   .user-menu:hover {
@@ -166,8 +158,8 @@ export default css`
 
   .user-menu img {
     display: block;
-    width: 30px;
-    height: 30px;
+    width: 4rem;
+    height: 4rem;
   }
 
   .link-home {
@@ -195,15 +187,20 @@ export default css`
 
   @media (min-width: 890px) {
     :host {
-      --userIconWidth: 32px;
-      --userIconHeight: 32px;
+      --userIconWidth: 3.2rem;
+      --userIconHeight: 3.2rem;
     }
 
+    .right-side-section {
+      display: contents;
+    }
+    .right-side-item {
+      padding: 0.5rem 0.5rem;
+    }
     nav {
       display: block;
       z-index: 3;
       height: 5rem;
-      padding-right: 1.5rem;
     }
 
     slot[name='opt-sec-logo-mobile'] {
@@ -220,14 +217,13 @@ export default css`
     }
 
     .hamburger,
-    .search-trigger,
+    .mobile-search-trigger,
     .mobile-donate-link {
       display: none;
     }
 
     .user-info {
       float: right;
-      padding-top: 1rem;
     }
 
     .user-menu {
@@ -245,8 +241,8 @@ export default css`
 
     .upload {
       display: block;
+      padding: 1rem 0.5rem;
       float: right;
-      margin-top: 1rem;
       font-size: 1.4rem;
       text-transform: uppercase;
       text-decoration: none;
@@ -259,8 +255,6 @@ export default css`
     }
 
     .upload svg {
-      width: 32px;
-      height: 32px;
       vertical-align: middle;
       fill: var(--iconFill);
     }

package/src/styles/user-menu.js

@@ -5,7 +5,7 @@ export default css`
     .initial,
     .closed,
     .open {
-      right: 21.3rem;
+      right: 20.5rem;
     }
 
     .search-hidden.initial,
@@ -19,7 +19,7 @@ export default css`
     .initial,
     .closed,
     .open {
-      right: 27.5rem;
+      right: 25.5rem;
     }
 
     .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/icon-upload-unpadded.js

@@ -1,15 +0,0 @@
-import { html } from 'https://offshoot.prod.archive.org/lit.js';
-
-export default html`
-  <svg
-    height="14"
-    width="14"
-    viewBox="8 8 24 24"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-labelledby="uploadTitleID uploadDescID"
-  >
-    <title id="uploadTitleID">Upload icon</title>
-    <desc id="uploadDescID">An illustration of a horizontal line over an up pointing arrow.</desc>
-    <path class="fill-color" d="m20 12.8 8 10.4h-4.8v8.8h-6.4v-8.8h-4.8zm12-4.8v3.2h-24v-3.2z" fill-rule="evenodd"/>
-  </svg>
-`;