2022-01-27 03:14:36 +01:00
17 changed files with 293 additions and 278 deletions
--- a/ui/component/channelStakedIndicator/view.jsx
+++ b/ui/component/channelStakedIndicator/view.jsx
@ -1,5 +1,4 @@
 // @flow
-import { SIMPLE_SITE } from 'config';
 import * as ICONS from 'constants/icons';
 import React from 'react';
 import classnames from 'classnames';
@ -39,33 +38,31 @@ function ChannelStakedIndicator(props: Props) {
  const icon = getChannelIcon(level);

  return (
-    SIMPLE_SITE && (
-      <Tooltip
-        label={
-          <div className="channel-staked__tooltip">
-            <div className="channel-staked__tooltip-icons">
-              <LevelIcon icon={icon} isControlling={isControlling} size={isControlling ? 14 : 10} />
-            </div>
+    <Tooltip
+      title={
+        <div className="channel-staked__tooltip">
+          <div className="channel-staked__tooltip-icons">
+            <LevelIcon icon={icon} isControlling={isControlling} size={isControlling ? 14 : 10} />
+          </div>

-            <div className="channel-staked__tooltip-text">
-              <span>{__('Level %current_level%', { current_level: level })}</span>
-              <div className="channel-staked__amount">
-                <LbcSymbol postfix={<CreditAmount amount={amount} showLBC={false} />} size={14} />
-              </div>
+          <div className="channel-staked__tooltip-text">
+            <span>{__('Level %current_level%', { current_level: level })}</span>
+            <div className="channel-staked__amount">
+              <LbcSymbol postfix={<CreditAmount amount={amount} showLBC={false} />} size={14} />
            </div>
          </div>
-        }
-      >
-        <div
-          className={classnames('channel-staked__wrapper', {
-            'channel-staked__wrapper--large': large,
-            'channel-staked__wrapper--inline': inline,
-          })}
-        >
-          <LevelIcon icon={icon} large={large} isControlling={isControlling} />
        </div>
-      </Tooltip>
-    )
+      }
+    >
+      <div
+        className={classnames('channel-staked__wrapper', {
+          'channel-staked__wrapper--large': large,
+          'channel-staked__wrapper--inline': inline,
+        })}
+      >
+        <LevelIcon icon={icon} large={large} isControlling={isControlling} />
+      </div>
+    </Tooltip>
  );
 }

--- a/ui/component/comment/view.jsx
+++ b/ui/component/comment/view.jsx
@ -241,7 +241,7 @@ function Comment(props: Props) {
          <div className="comment__meta">
            <div className="comment__meta-information">
              {isGlobalMod && (
-                <Tooltip label={__('Admin')}>
+                <Tooltip title={__('Admin')}>
                  <span className="comment__badge comment__badge--global-mod">
                    <Icon icon={ICONS.BADGE_MOD} size={20} />
                  </span>
@ -249,7 +249,7 @@ function Comment(props: Props) {
              )}

              {isModerator && (
-                <Tooltip label={__('Moderator')}>
+                <Tooltip title={__('Moderator')}>
                  <span className="comment__badge comment__badge--mod">
                    <Icon icon={ICONS.BADGE_MOD} size={20} />
                  </span>
--- a/ui/component/common/tooltip.jsx
+++ b/ui/component/common/tooltip.jsx
@ -1,18 +1,30 @@
 // @flow
-import type { Node } from 'react';
 import React from 'react';
-import ReachTooltip from '@reach/tooltip';
-// import '@reach/tooltip/styles.css'; --> 'scss/third-party.scss'
+import MUITooltip from '@mui/material/Tooltip';
+import type { Node } from 'react';

 type Props = {
-  label: string | Node,
+  arrow?: boolean,
  children: Node,
+  disableInteractive?: boolean,
+  enterDelay?: number,
+  title?: string | Node,
 };

 function Tooltip(props: Props) {
-  const { children, label } = props;
+  const { arrow = true, children, disableInteractive = true, enterDelay = 300, title } = props;

-  return <ReachTooltip label={label}>{children}</ReachTooltip>;
+  return (
+    <MUITooltip
+      arrow={arrow}
+      disableInteractive={disableInteractive}
+      enterDelay={enterDelay}
+      enterNextDelay={enterDelay}
+      title={title}
+    >
+      {children}
+    </MUITooltip>
+  );
 }

 export default Tooltip;
--- a/ui/component/fileRenderFloating/view.jsx
+++ b/ui/component/fileRenderFloating/view.jsx
@ -17,6 +17,10 @@ import { useHistory } from 'react-router';
 import { isURIEqual } from 'util/lbryURI';
 import AutoplayCountdown from 'component/autoplayCountdown';

+// scss/init/vars.scss
+// --header-height
+const HEADER_HEIGHT = 64;
+
 const IS_DESKTOP_MAC = typeof process === 'object' ? process.platform === 'darwin' : false;
 const DEBOUNCE_WINDOW_RESIZE_HANDLER_MS = 100;
 export const INLINE_PLAYER_WRAPPER_CLASS = 'inline-player__wrapper';
@ -351,8 +355,7 @@ export default function FileRenderFloating(props: Props) {
                width: fileViewerRect.width,
                height: fileViewerRect.height,
                left: fileViewerRect.x,
-                // 80px is header height in scss/init/vars.scss
-                top: fileViewerRect.windowOffset + fileViewerRect.top - 80 - (IS_DESKTOP_MAC ? 24 : 0),
+                top: fileViewerRect.windowOffset + fileViewerRect.top - HEADER_HEIGHT - (IS_DESKTOP_MAC ? 24 : 0),
              }
            : {}
        }
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@ -1,4 +1,6 @@
 // @flow
+// import 'scss/component/_header.scss'; // ody codesplits this. no.
+
 import { useIsMobile } from 'effects/use-screensize';
 import { withRouter } from 'react-router';
 import * as ICONS from 'constants/icons';
@ -11,13 +13,13 @@ import Logo from 'component/logo';
 import NotificationBubble from 'component/notificationBubble';
 import React from 'react';
 import SkipNavigationButton from 'component/skipNavigationButton';
+import Tooltip from 'component/common/tooltip';
 import WunderBar from 'component/wunderbar';
 import * as remote from '@electron/remote';
 import { IS_MAC } from 'component/app/view';
 import NavigationButton from 'component/navigationButton';

 type Props = {
-  authenticated: boolean,
  authHeader: boolean,
  backout: {
    backLabel?: string,
@ -49,7 +51,6 @@ type Props = {

 const Header = (props: Props) => {
  const {
-    authenticated,
    authHeader,
    backout,
    balance,
@ -119,24 +120,35 @@ const Header = (props: Props) => {
    }
  }, [canBackout, onBackout]);

-  const userButtons = (className: string) => (
-    <div className={classnames('header__menu', { 'header__menu--with-balance': authenticated })}>
-      <Button
+  const userButtons = (hideWallet?: boolean, hideProfile?: boolean) => (
+    <div className="header__menu--right">
+      {isMobile && !authHeader && !canBackout && <WunderBar />}
+      <Tooltip
        title={
          balance > 0
            ? __('Immediately spendable: %spendable_balance%', { spendable_balance: roundedSpendableBalance })
            : __('Your Wallet')
        }
-        navigate={`/$/${PAGES.WALLET}`}
-        className={classnames(className, 'header__navigation-item--balance')}
-        label={hideBalance || Number(roundedBalance) === 0 ? __('Your Wallet') : roundedBalance}
-        icon={ICONS.LBC}
-        // @if TARGET='app'
-        onDoubleClick={(e) => {
-          e.stopPropagation();
-        }}
-        // @endif
-      />
+      >
+        <div>
+          <Button
+            // title={
+            //   balance > 0
+            //     ? __('Immediately spendable: %spendable_balance%', { spendable_balance: roundedSpendableBalance })
+            //     : __('Your Wallet')
+            // }
+            navigate={`/$/${PAGES.WALLET}`}
+            className="button--file-action header__navigationItem--balance"
+            label={hideBalance || Number(roundedBalance) === 0 ? __('Your Wallet') : roundedBalance}
+            icon={ICONS.LBC}
+            // @if TARGET='app'
+            onDoubleClick={(e) => {
+              e.stopPropagation();
+            }}
+            // @endif
+          />
+        </div>
+      </Tooltip>

      <HeaderProfileMenuButton />
    </div>
@ -154,50 +166,51 @@ const Header = (props: Props) => {
      }}
      // @endif
    >
-      <div className="header__contents">
+      <div className="card__actions--between header__contents">
        {!authHeader && canBackout ? (
-          <div className="card__actions--between">
-            <Button onClick={onBackout} button="link" label={backLabel || __('Cancel')} icon={ICONS.ARROW_LEFT} />
-
-            {backTitle && <h1 className="header__auth-title">{(isMobile && simpleBackTitle) || backTitle}</h1>}
-
-            {userButtons('header__navigation-item menu__title')}
-          </div>
+          <>
+            <div className="header__menu--left">
+              <Button onClick={onBackout} button="link" label={backLabel || __('Cancel')} icon={ICONS.ARROW_LEFT} />
+            </div>
+            {backTitle && <h1 className="header__authTitle">{(isMobile && simpleBackTitle) || backTitle}</h1>}
+            {userButtons(false, isMobile)}
+          </>
        ) : (
          <>
            <div className="header__navigation">
-              <SkipNavigationButton />
+              <div className="header__menu--left">
+                <SkipNavigationButton />
+                {!authHeader && (
+                  <span style={{ position: 'relative' }}>
+                    <Button
+                      aria-label={sidebarLabel}
+                      className="header__navigationItem--icon"
+                      icon={ICONS.MENU}
+                      aria-expanded={sidebarOpen}
+                      onClick={() => setSidebarOpen(!sidebarOpen)}
+                    >
+                      {isAbsoluteSideNavHidden && isMobile && <NotificationBubble />}
+                    </Button>
+                  </span>
+                )}
+                <Button
+                  aria-label={__('Home')}
+                  className="header__navigationItem--logo"
+                  onClick={() => {
+                    // here use state.router.location.pathname
+                    if (history.location.pathname === '/') window.location.reload();
+                  }}
+                  // @if TARGET='app'
+                  onDoubleClick={(e) => {
+                    e.stopPropagation();
+                  }}
+                  // @endif
+                  {...homeButtonNavigationProps}
+                >
+                  <Logo />
+                </Button>
+              </div>

-              {!authHeader && (
-                <span style={{ position: 'relative' }}>
-                  <Button
-                    aria-label={sidebarLabel}
-                    className="header__navigation-item menu__title header__navigation-item--icon"
-                    icon={ICONS.MENU}
-                    aria-expanded={sidebarOpen}
-                    onClick={() => setSidebarOpen(!sidebarOpen)}
-                  >
-                    {isAbsoluteSideNavHidden && isMobile && <NotificationBubble />}
-                  </Button>
-                </span>
-              )}
-
-              <Button
-                aria-label={__('Home')}
-                className="header__navigation-item header__navigation-item--lbry"
-                onClick={() => {
-                  // here use state.router.location.pathname
-                  if (history.location.pathname === '/') window.location.reload();
-                }}
-                // @if TARGET='app'
-                onDoubleClick={(e) => {
-                  e.stopPropagation();
-                }}
-                // @endif
-                {...homeButtonNavigationProps}
-              >
-                <Logo />
-              </Button>
              {!authHeader && (
                <div className="header__center">
                  {/* @if TARGET='app' */}
@ -212,37 +225,33 @@ const Header = (props: Props) => {
                  <HeaderMenuButtons />
                </div>
              )}
+
+              {!authHeader && !canBackout
+                ? userButtons(isMobile)
+                : !isVerifyPage &&
+                  !hideCancel && (
+                    <div className="header__menu--right">
+                      <Button
+                        title={__('Go Back')}
+                        button="alt"
+                        // className="button--header-close"
+                        icon={ICONS.REMOVE}
+                        onClick={() => {
+                          clearEmailEntry();
+                          clearPasswordEntry();
+
+                          if (syncError) signOut();
+
+                          if ((isSignInPage && !emailToVerify) || isSignUpPage || isPwdResetPage) {
+                            goBack();
+                          } else {
+                            push('/');
+                          }
+                        }}
+                      />
+                    </div>
+                  )}
            </div>
-
-            {!authHeader && !canBackout
-              ? userButtons('header__navigation-item menu__title mobile-hidden')
-              : !isVerifyPage &&
-                !hideCancel && (
-                  <div className="header__menu">
-                    {/* Add an empty span here so we can use the same style as above */}
-                    {/* This pushes the close button to the right side */}
-                    <span />
-
-                    <Button
-                      title={__('Go Back')}
-                      button="alt"
-                      // className="button--header-close"
-                      icon={ICONS.REMOVE}
-                      onClick={() => {
-                        clearEmailEntry();
-                        clearPasswordEntry();
-
-                        if (syncError) signOut();
-
-                        if ((isSignInPage && !emailToVerify) || isSignUpPage || isPwdResetPage) {
-                          goBack();
-                        } else {
-                          push('/');
-                        }
-                      }}
-                    />
-                  </div>
-                )}
          </>
        )}
      </div>
--- a/ui/component/headerMenuButtons/view.jsx
+++ b/ui/component/headerMenuButtons/view.jsx
@ -1,12 +1,15 @@
 // @flow
+// import 'scss/component/_header.scss'; // ody codesplits this; no.
+
 import { ENABLE_UI_NOTIFICATIONS } from 'config';
 import { Menu, MenuList, MenuButton, MenuItem } from '@reach/menu-button';
 import * as ICONS from 'constants/icons';
 import * as PAGES from 'constants/pages';
 import HeaderMenuLink from 'component/common/header-menu-link';
 import Icon from 'component/common/icon';
-import NotificationHeaderButton from 'component/notificationHeaderButton';
+import NotificationHeaderButton from 'component/headerNotificationButton';
 import React from 'react';
+import Tooltip from 'component/common/tooltip';

 type HeaderMenuButtonProps = {
  authenticated: boolean,
@ -24,13 +27,11 @@ export default function HeaderMenuButtons(props: HeaderMenuButtonProps) {
  return (
    <div className="header__buttons">
      <Menu>
-        <MenuButton
-          aria-label={__('Publish a file, or create a channel')}
-          title={__('Publish a file, or create a channel')}
-          className="header__navigation-item menu__title header__navigation-item--icon mobile-hidden"
-        >
-          <Icon size={18} icon={ICONS.PUBLISH} aria-hidden />
-        </MenuButton>
+        <Tooltip title={__('Publish a file, or create a channel')}>
+          <MenuButton className="header__navigationItem--icon">
+            <Icon size={18} icon={ICONS.PUBLISH} aria-hidden />
+          </MenuButton>
+        </Tooltip>

        <MenuList className="menu__list--header">
          <HeaderMenuLink page={PAGES.UPLOAD} icon={ICONS.PUBLISH} name={__('Upload')} />
@ -41,13 +42,11 @@ export default function HeaderMenuButtons(props: HeaderMenuButtonProps) {
      {notificationsEnabled && <NotificationHeaderButton />}

      <Menu>
-        <MenuButton
-          aria-label={__('Settings')}
-          title={__('Settings')}
-          className="header__navigation-item menu__title header__navigation-item--icon  mobile-hidden"
-        >
-          <Icon size={18} icon={ICONS.SETTINGS} aria-hidden />
-        </MenuButton>
+        <Tooltip title={__('Settings')}>
+          <MenuButton className="header__navigationItem--icon">
+            <Icon size={18} icon={ICONS.SETTINGS} aria-hidden />
+          </MenuButton>
+        </Tooltip>

        <MenuList className="menu__list--header">
          <HeaderMenuLink page={PAGES.SETTINGS} icon={ICONS.SETTINGS} name={__('Settings')} />
--- a/ui/component/headerNotificationButton/index.js
+++ b/ui/component/headerNotificationButton/index.js
@ -1,16 +1,10 @@
 import { connect } from 'react-redux';
-import {
-  selectNotifications,
-  selectIsFetchingNotifications,
-  selectUnseenNotificationCount,
-} from 'redux/selectors/notifications';
+import { selectUnseenNotificationCount } from 'redux/selectors/notifications';
 import { doSeeAllNotifications } from 'redux/actions/notifications';
 import { selectUser } from 'redux/selectors/user';
 import NotificationHeaderButton from './view';

-const select = state => ({
-  notifications: selectNotifications(state),
-  fetching: selectIsFetchingNotifications(state),
+const select = (state) => ({
  unseenCount: selectUnseenNotificationCount(state),
  user: selectUser(state),
 });
--- a/ui/component/headerNotificationButton/view.jsx
+++ b/ui/component/headerNotificationButton/view.jsx
@ -1,51 +1,41 @@
 // @flow
-import * as PAGES from 'constants/pages';
+// import 'scss/component/_header.scss'; // ody codesplits this; no. REMOVE THESE
+
+import { ENABLE_UI_NOTIFICATIONS } from 'config';
+import { useHistory } from 'react-router';
 import * as ICONS from 'constants/icons';
-import React from 'react';
+import * as PAGES from 'constants/pages';
+import Button from 'component/button';
 import Icon from 'component/common/icon';
 import NotificationBubble from 'component/notificationBubble';
-import Button from 'component/button';
-import { useHistory } from 'react-router';
-import { ENABLE_UI_NOTIFICATIONS } from 'config';
+import React from 'react';
+import Tooltip from 'component/common/tooltip';

 type Props = {
  unseenCount: number,
-  doSeeAllNotifications: () => void,
  user: ?User,
+  doSeeAllNotifications: () => void,
 };

 export default function NotificationHeaderButton(props: Props) {
-  const {
-    unseenCount,
-    // notifications,
-    // fetching,
-    doSeeAllNotifications,
-    user,
-  } = props;
-  const notificationsEnabled = ENABLE_UI_NOTIFICATIONS || (user && user.experimental_ui);
+  const { unseenCount, user, doSeeAllNotifications } = props;
+
  const { push } = useHistory();
+  const notificationsEnabled = ENABLE_UI_NOTIFICATIONS || (user && user.experimental_ui);

  function handleMenuClick() {
-    if (unseenCount > 0) {
-      doSeeAllNotifications();
-    }
-
+    if (unseenCount > 0) doSeeAllNotifications();
    push(`/$/${PAGES.NOTIFICATIONS}`);
  }

-  if (!notificationsEnabled) {
-    return null;
-  }
+  if (!notificationsEnabled) return null;

  return (
-    <Button
-      onClick={handleMenuClick}
-      aria-label={__('Notifications')}
-      title={__('Notifications')}
-      className="header__navigation-item menu__title header__navigation-item--icon mobile-hidden"
-    >
-      <Icon size={18} icon={ICONS.NOTIFICATION} aria-hidden />
-      <NotificationBubble />
-    </Button>
+    <Tooltip title={__('Notifications')}>
+      <Button onClick={handleMenuClick} className="header__navigationItem--icon">
+        <Icon size={18} icon={ICONS.NOTIFICATION} aria-hidden />
+        <NotificationBubble />
+      </Button>
+    </Tooltip>
  );
 }
--- a/ui/component/headerProfileMenuButton/view.jsx
+++ b/ui/component/headerProfileMenuButton/view.jsx
@ -1,4 +1,6 @@
 // @flow
+// import 'scss/component/_header.scss'; // REMOVE!
+
 import { Menu, MenuList, MenuButton, MenuItem } from '@reach/menu-button';
 import * as ICONS from 'constants/icons';
 import * as PAGES from 'constants/pages';
@ -26,9 +28,9 @@ export default function HeaderProfileMenuButton(props: HeaderMenuButtonProps) {
        <MenuButton
          aria-label={__('Your account')}
          title={__('Your account')}
-          className={classnames('header__navigation-item', {
-            'menu__title header__navigation-item--icon': !activeChannelUrl,
-            'header__navigation-item--profile-pic': activeChannelUrl,
+          className={classnames('header__navigationItem', {
+            'header__navigationItem--icon': !activeChannelUrl,
+            'header__navigationItem--profilePic': activeChannelUrl,
          })}
        >
          {activeChannelUrl ? (
--- a/ui/scss/component/_channel.scss
+++ b/ui/scss/component/_channel.scss
@ -363,17 +363,6 @@ $actions-z-index: 2;
  }
 }

-.channel-staked__tooltip {
-  display: flex;
-  align-items: center;
-  line-height: 1rem;
-}
-
-.channel-staked__tooltip-text {
-  margin-left: var(--spacing-xs);
-  font-size: var(--font-xsmall);
-}
-
 .channel-staked__wrapper {
  display: flex;
  position: absolute;
--- a/ui/scss/component/_header.scss
+++ b/ui/scss/component/_header.scss
@ -1,3 +1,6 @@
+@import '../init/vars';
+@import '../init/mixins';
+
 .header {
  z-index: 3; // Main content uses z-index: 1, other content uses z-index: 2, this ensures it always scrolls under the header
  position: fixed;
@ -6,6 +9,7 @@
  background-color: var(--color-header-background);
  box-shadow: var(--card-box-shadow);
  font-size: var(--font-body);
+  user-select: none;
  -webkit-user-select: none;
  -webkit-app-region: drag;

@ -23,31 +27,32 @@
      opacity: 1;
      position: relative;
      overflow: unset;
-      width: inherit;
-      height: inherit;
+      width: unset;
+      height: unset;
    }
  }
-
-  & > * {
-    user-select: none;
-  }
 }

 .header--minimal {
  box-shadow: none;
  background-color: var(--color-background);
  border-bottom: none;
-}

-.header--mac {
-  padding-top: var(--mac-titlebar-height);
+  .header__navigation {
+    padding: var(--spacing-xs);
+  }
+
+  .header__navigationItem--logo {
+    height: 3rem;
+  }
 }

 .header__contents {
-  height: calc(var(--header-height));
  display: flex;
  align-items: center;
-  padding: 0 var(--spacing-m);
+  flex: 1;
+  height: var(--header-height);
+  padding: var(--spacing-s) var(--spacing-m);

  @media (max-width: $breakpoint-small) {
    padding: var(--spacing-xs);
@ -55,17 +60,42 @@
 }

 .header__navigation {
-  flex: 1;
  display: flex;
  align-items: center;
+  justify-content: space-between;
+  flex: 1;
+  height: var(--header-height);
+  padding: var(--spacing-s) var(--spacing-m);
+  flex-wrap: nowrap;
+}
+
+.card__actions--between {
+  .header__menu--left {
+    @media (max-width: $breakpoint-small) {
+      max-width: 3rem;
+    }
+  }
 }

 .header__menu {
  display: flex;
-  justify-content: space-between;
  align-items: center;
 }

+.header__menu--left {
+  @extend .header__menu;
+  justify-content: flex-start;
+}
+
+.header__menu--right {
+  @extend .header__menu;
+  justify-content: flex-end;
+
+  @media (max-width: $breakpoint-small) {
+    max-width: 4rem;
+  }
+}
+
 .header__buttons {
  display: flex;
 }
@ -77,7 +107,7 @@
  max-width: fit-content;
 }

-.header__navigation-item {
+.header__navigationItem {
  height: var(--height-button);
  display: flex;
  justify-content: center;
@ -89,11 +119,16 @@
  svg {
    stroke: var(--color-text);
  }
+
+  &[aria-expanded='true'] {
+    background-color: var(--color-header-button-active);
+  }
 }

 .header__navigation-item--back,
 .header__navigation-item--forward,
-.header__navigation-item--icon {
+.header__navigationItem--icon {
+  @extend .header__navigationItem;
  width: var(--height-button);
  background-color: var(--color-header-button);
  border-radius: 1.5rem;
@ -109,6 +144,10 @@
    }
  }

+  @media (max-width: $breakpoint-small) {
+    margin: 0;
+  }
+
  span {
    display: flex;
    justify-content: center;
@ -116,8 +155,8 @@
  }
 }

-.header__navigation-item--profile-pic {
-  margin-left: var(--spacing-m);
+.header__navigationItem--profilePic {
+  margin-right: var(--spacing-s);

  .channel-thumbnail {
    height: var(--height-button);
@ -130,8 +169,8 @@
  }
 }

-.header__navigation-item--balance {
-  @extend .button--file-action;
+.header__navigationItem--balance {
+  @extend .header__navigationItem;
  margin: 0 var(--spacing-s);
  color: var(--color-text);

@ -140,17 +179,8 @@
  }
 }

-.header__navigation-item--forward {
-  margin-right: 0;
-}
-
-.header__navigation-item--icon {
-  @media (max-width: $breakpoint-small) {
-    margin: 0;
-  }
-}
-
-.header__navigation-item--lbry {
+.header__navigationItem--logo {
+  @extend .header__navigationItem;
  height: 4rem;
  display: flex;
  align-items: center;
@ -172,61 +202,44 @@
  }
 }

-.header--minimal {
-  .header__navigation-item--lbry {
-    height: 3rem;
-  }
-}
-
-.header__navigation-dropdown {
-  @extend .menu__list--header;
-  padding: 0;
-  position: absolute;
-  list-style-type: none;
-  background-color: var(--color-header-background);
-}
-
-.header__navigation-button {
-  margin: 0;
-  padding: var(--spacing-xxs) var(--spacing-m);
-  display: flex;
-  align-items: center;
-
-  &:hover {
-    cursor: pointer;
-    background-color: var(--color-menu-background--active);
-  }
-}
-
-.header__navigation-button-help {
-  @extend .help;
-  margin-top: 0;
-  margin-left: var(--spacing-s);
-}
-
-.header__auth-buttons {
+.header__authButtons {
  display: flex;
  align-items: center;
  font-weight: var(--font-weight-bold);
-  margin-left: var(--spacing-s);

  & > *:not(:last-child) {
    margin: 0 var(--spacing-m);
  }
+
+  @media (max-width: $breakpoint-small) {
+    .button--link {
+      margin: 0;
+    }
+
+    .button--primary {
+      padding: var(--spacing-xxs);
+    }
+  }
 }

 .header__center {
  display: flex;
-  justify-content: flex-end;
+  justify-content: center;
  width: 100%;
-
-  @media (min-width: $breakpoint-small) {
-    justify-content: center;
-  }
 }

-.header__auth-title {
+.header__authTitle {
+  @extend .header__center;
+  justify-content: center;
+
  @media (min-width: $breakpoint-small) {
    font-size: var(--font-large);
  }
 }
+
+.ReactModal__Overlay {
+  .button--close {
+    margin: 0;
+    margin-top: var(--spacing-xxs);
+  }
+}
--- a/ui/scss/component/_tooltip.scss
+++ b/ui/scss/component/_tooltip.scss
@ -1,8 +1,24 @@
-[data-reach-tooltip] {
-  border-radius: var(--border-radius);
-  background-color: var(--color-tooltip-bg);
-  color: var(--color-tooltip-text);
-  border: none;
-  padding: var(--spacing-s);
-  overflow: hidden;
+.MuiTooltip-tooltip {
+  border-radius: var(--border-radius) !important;
+  background-color: var(--color-tooltip-bg) !important;
+  color: var(--color-tooltip-text) !important;
+  font-size: var(--font-small) !important;
+}
+
+.MuiTooltip-arrow {
+  color: var(--color-tooltip-bg) !important;
+  font-size: var(--font-xxsmall) !important;
+}
+
+.channel-staked__tooltip {
+  display: flex;
+  align-items: center;
+  line-height: 1rem;
+  padding: var(--spacing-xs);
+
+  .channel-staked__tooltip-text {
+    margin-left: var(--spacing-xs);
+    font-size: var(--font-xsmall);
+    font-size: var(--font-small);
+  }
 }
--- a/ui/scss/component/_wunderbar.scss
+++ b/ui/scss/component/_wunderbar.scss
@ -1,3 +1,5 @@
+@import './header';
+
 .wunderbar__wrapper {
  flex: 1;
  max-width: 30rem;
@ -103,7 +105,7 @@
  position: absolute;
  left: 0;
  right: 0;
-  top: calc(var(--header-height) - (var(--height-input)) + 3px);
+  top: calc(var(--header-height) - var(--spacing-m) - 3px);
  @extend .card;
  box-shadow: var(--card-box-shadow);
  border-top-right-radius: 0;
@ -227,7 +229,7 @@

 .wunderbar__mobile-search {
  @extend .button--alt;
-  @extend .header__navigation-item--icon;
+  @extend .header__navigationItem--icon;
  padding: var(--spacing-xs);
  margin-right: var(--spacing-m);

--- a/ui/scss/component/menu-button.scss
+++ b/ui/scss/component/menu-button.scss
@ -65,12 +65,6 @@
  }
 }

-.menu__title {
-  &[aria-expanded='true'] {
-    background-color: var(--color-header-button-active);
-  }
-}
-
 .menu__list {
  box-shadow: var(--card-box-shadow);
  animation: menu-animate-in var(--animation-duration) var(--animation-style);
@ -86,7 +80,7 @@

 .menu__list--header {
  @extend .menu__list;
-  margin-top: 19px;
+  margin-top: var(--spacing-s);
 }

 .menu__list--comments {
--- a/ui/scss/init/_gui.scss
+++ b/ui/scss/init/_gui.scss
@ -480,12 +480,6 @@ textarea {
  }
 }

-.mobile-hidden {
-  @media (max-width: $breakpoint-small) {
-    display: none !important;
-  }
-}
-
 .ads-test {
  height: 50vh;
  position: relative;
--- a/ui/scss/init/_vars.scss
+++ b/ui/scss/init/_vars.scss
@ -72,7 +72,7 @@ $breakpoint-large: 1600px;
  // Header
  // This is tied to the floating player so it knows where to attach to
  // ui/component/fileRenderFloating/view.jsx
-  --header-height: 80px;
+  --header-height: 64px;

  // Inline Player
  --inline-player-max-height: calc(100vh - var(--header-height) - var(--spacing-l) * 2);
--- a/ui/scss/themes/dark.scss
+++ b/ui/scss/themes/dark.scss
@ -123,6 +123,7 @@
  --color-purchased-text: var(--color-gray-5);
  --color-thumbnail-background: var(--color-gray-5);
  --color-tooltip-bg: #2f3337;
+  --color-tooltip-text: #fafafa;
  --color-help-warning-bg: #d97706;
  --color-help-warning-text: white;
  --color-blockquote: var(--color-gray-5);