From d5e5019cc88001938453d079af9c6d582bfbb8ed Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Tue, 28 Jun 2022 14:01:26 +0100
Subject: [PATCH] header space saving & interaction tweaks (#1549)

* header space saving & interaction tweaks

* remove network name reveal interaction on small viewports
* increase header button sizes for all viewports for better tap targets
* tweak flex layout
* remove caret from version badge on smaller viewports

* fix NFT tooltip icon placement

* spacing tweak

* caret css cleanup

* remove reconnecting message

* squeeze more space out of network, test label

* more space from unsupported network indicator
---
 .../@shared/NetworkName/index.module.css      |  8 +++--
 .../AssetContent/MetaMain/index.module.css    | 11 +++++--
 src/components/Header/Menu.module.css         | 33 ++++++++++++-------
 src/components/Header/Menu.tsx                |  3 +-
 src/components/Header/SearchBar.module.css    |  2 +-
 .../Networks/NetworkItem.module.css           |  2 +-
 .../Header/UserPreferences/index.module.css   | 23 ++-----------
 .../Header/Wallet/Account.module.css          | 29 +++-------------
 src/components/Header/Wallet/Account.tsx      |  4 +--
 .../Header/Wallet/Network.module.css          | 13 ++++++--
 src/components/Header/index.module.css        |  2 --
 src/components/Header/index.tsx               |  3 +-
 12 files changed, 60 insertions(+), 73 deletions(-)
 delete mode 100644 src/components/Header/index.module.css

diff --git a/src/components/@shared/NetworkName/index.module.css b/src/components/@shared/NetworkName/index.module.css
index 6aab11504..01e4a6d21 100644
--- a/src/components/@shared/NetworkName/index.module.css
+++ b/src/components/@shared/NetworkName/index.module.css
@@ -22,7 +22,9 @@
   width: 0;
 }
 
-.minimal:hover .name {
-  width: auto;
-  opacity: 1;
+@media screen and (min-width: 42rem) {
+  .minimal:hover .name {
+    width: auto;
+    opacity: 1;
+  }
 }
diff --git a/src/components/Asset/AssetContent/MetaMain/index.module.css b/src/components/Asset/AssetContent/MetaMain/index.module.css
index f04afa777..b56f0c246 100644
--- a/src/components/Asset/AssetContent/MetaMain/index.module.css
+++ b/src/components/Asset/AssetContent/MetaMain/index.module.css
@@ -1,11 +1,18 @@
 .meta {
-  margin-left: calc(var(--spacer) * -1);
-  margin-right: calc(var(--spacer) * -1);
+  margin-left: calc(var(--spacer) * -0.75);
+  margin-right: calc(var(--spacer) * -0.75);
   margin-bottom: calc(var(--spacer) / 1.5);
   color: var(--color-secondary);
   font-size: var(--font-size-small);
 }
 
+@media (min-width: 40rem) {
+  .meta {
+    margin-left: calc(var(--spacer) * -1);
+    margin-right: calc(var(--spacer) * -1);
+  }
+}
+
 .asset {
   display: flex;
   justify-content: flex-start;
diff --git a/src/components/Header/Menu.module.css b/src/components/Header/Menu.module.css
index d35de150c..3e27d5e55 100644
--- a/src/components/Header/Menu.module.css
+++ b/src/components/Header/Menu.module.css
@@ -1,9 +1,8 @@
 .menu {
   width: 100%;
-  padding: calc(var(--spacer) / 2);
+  padding: calc(var(--spacer) / 2) calc(var(--spacer) / 3);
   display: flex;
   align-items: center;
-  justify-content: space-between;
   flex-wrap: wrap;
 }
 
@@ -21,7 +20,6 @@
 .badge {
   cursor: pointer;
   margin-top: -0.25rem;
-  position: relative;
   padding: calc(var(--spacer) / 5) calc(var(--spacer) / 4);
 }
 
@@ -39,6 +37,7 @@
 .actions {
   order: 2;
   display: flex;
+  margin-left: auto;
 }
 
 .title {
@@ -47,7 +46,7 @@
 
 @media screen and (min-width: 42rem) {
   .menu {
-    justify-content: start;
+    padding: calc(var(--spacer) / 2);
   }
 
   .navigation {
@@ -138,18 +137,26 @@
   text-transform: none;
 }
 
-.tooltip[aria-expanded='true'] svg {
+.caret,
+svg.caret {
+  display: none;
+  width: var(--font-size-small);
+  height: var(--font-size-small);
+  fill: var(--border-color);
+  transition: transform 0.2s ease-out;
+  vertical-align: middle;
+  margin-left: calc(var(--spacer) / 4);
+}
+
+[aria-expanded='true'] .caret {
   transform: rotate(180deg);
 }
 
-.caret,
-svg.caret {
-  width: var(--font-size-mini);
-  height: var(--font-size-mini);
+.badge .caret {
   fill: var(--brand-white);
   opacity: 0.7;
-  transition: transform 0.2s ease-out;
-  vertical-align: middle;
+  width: var(--font-size-mini);
+  height: var(--font-size-mini);
   margin-left: calc(var(--spacer) / 12);
 }
 
@@ -158,6 +165,10 @@ svg.caret {
   svg.caret {
     display: inline-block;
   }
+
+  .navigation {
+    margin-left: calc(var(--spacer) / 2);
+  }
 }
 
 .versions {
diff --git a/src/components/Header/Menu.tsx b/src/components/Header/Menu.tsx
index 7e0f090a5..03e5a8b4a 100644
--- a/src/components/Header/Menu.tsx
+++ b/src/components/Header/Menu.tsx
@@ -46,7 +46,7 @@ export default function Menu(): ReactElement {
       </Link>
 
       <Tooltip
-        className={styles.tooltip}
+        className={styles.badgeWrap}
         content={
           <div className={styles.versions}>
             <a className={styles.link} href={appConfig.v3MarketUri}>
@@ -69,6 +69,7 @@ export default function Menu(): ReactElement {
           }
         />
       </Tooltip>
+
       <ul className={styles.navigation}>
         {siteContent?.menu.map((item: MenuItem) => (
           <li key={item.name}>
diff --git a/src/components/Header/SearchBar.module.css b/src/components/Header/SearchBar.module.css
index 571b6a641..a2f582104 100644
--- a/src/components/Header/SearchBar.module.css
+++ b/src/components/Header/SearchBar.module.css
@@ -28,7 +28,7 @@
 .input {
   font-size: 16px; /* prevent zoom in on input focus on mobile devices  */
   background-color: transparent;
-  height: 36px;
+  height: 41px;
   margin: 0;
   outline: 0;
   padding-right: var(--spacer);
diff --git a/src/components/Header/UserPreferences/Networks/NetworkItem.module.css b/src/components/Header/UserPreferences/Networks/NetworkItem.module.css
index 8fe117c1b..015c053a4 100644
--- a/src/components/Header/UserPreferences/Networks/NetworkItem.module.css
+++ b/src/components/Header/UserPreferences/Networks/NetworkItem.module.css
@@ -1,6 +1,6 @@
 .radioWrap {
   composes: radioWrap from '@shared/FormInput/InputRadio.module.css';
-  padding: calc(var(--spacer) / 6) calc(var(--spacer) / 3);
+  padding: calc(var(--spacer) / 4) calc(var(--spacer) / 3);
   border-bottom: 1px solid var(--border-color);
 }
 
diff --git a/src/components/Header/UserPreferences/index.module.css b/src/components/Header/UserPreferences/index.module.css
index 8246b1d3c..011eca707 100644
--- a/src/components/Header/UserPreferences/index.module.css
+++ b/src/components/Header/UserPreferences/index.module.css
@@ -1,5 +1,5 @@
 .preferences {
-  padding: calc(var(--spacer) / 6) calc(var(--spacer) / 3);
+  padding: calc(var(--spacer) / 4) calc(var(--spacer) / 3);
   cursor: pointer;
   border: 1px solid var(--border-color);
   border-radius: var(--border-radius);
@@ -13,25 +13,8 @@
   vertical-align: middle;
 }
 
-.preferences[aria-expanded='true'] svg {
-  transform: rotate(180deg);
-}
-
-.caret,
-svg.caret {
-  width: var(--font-size-small);
-  height: var(--font-size-small);
-  fill: var(--border-color);
-  margin-left: calc(var(--spacer) / 4);
-  transition: transform 0.2s ease-out;
-  display: none;
-}
-
-@media screen and (min-width: 42rem) {
-  .caret,
-  svg.caret {
-    display: inline-block;
-  }
+.caret {
+  composes: caret from '../Menu.module.css';
 }
 
 .icon {
diff --git a/src/components/Header/Wallet/Account.module.css b/src/components/Header/Wallet/Account.module.css
index 1dbce49f8..adbcbe78b 100644
--- a/src/components/Header/Wallet/Account.module.css
+++ b/src/components/Header/Wallet/Account.module.css
@@ -5,7 +5,7 @@
   text-transform: uppercase;
   border: 1px solid var(--border-color);
   border-radius: var(--border-radius);
-  padding: calc(var(--spacer) / 6) calc(var(--spacer) / 3);
+  padding: calc(var(--spacer) / 4) calc(var(--spacer) / 3);
   white-space: nowrap;
   background: var(--background-content);
   margin: 0;
@@ -38,6 +38,7 @@
 @media screen and (min-width: 42rem) {
   .button.initial span {
     display: inline;
+    margin-left: 0.2rem;
   }
 }
 
@@ -59,34 +60,12 @@
   }
 }
 
-.button svg {
-  width: 1em;
-  height: 1em;
-  fill: var(--border-color);
-  display: inline-block;
-  vertical-align: middle;
-  margin-left: calc(var(--spacer) / 3);
-  transition: transform 0.2s ease-out;
-}
-
-[aria-expanded='true'] .button svg {
-  transform: rotate(180deg);
-}
-
 .status {
   margin-left: calc(var(--spacer) / 4);
   position: relative;
   top: 1px;
 }
 
-.caret,
-svg.caret {
-  display: none;
-}
-
-@media screen and (min-width: 42rem) {
-  .caret,
-  svg.caret {
-    display: inline-block;
-  }
+.caret {
+  composes: caret from '../Menu.module.css';
 }
diff --git a/src/components/Header/Wallet/Account.tsx b/src/components/Header/Wallet/Account.tsx
index a4724db7e..e81f4edd5 100644
--- a/src/components/Header/Wallet/Account.tsx
+++ b/src/components/Header/Wallet/Account.tsx
@@ -21,7 +21,7 @@ const Account = React.forwardRef((props, ref: any) => {
   return !accountId && web3Modal?.cachedProvider ? (
     // Improve user experience for cached provider when connecting takes some time
     <button className={styles.button} onClick={(e) => e.preventDefault()}>
-      <Loader message="Reconnecting..." />
+      <Loader />
     </button>
   ) : accountId ? (
     <button
@@ -44,7 +44,7 @@ const Account = React.forwardRef((props, ref: any) => {
       // the Tippy to show in this state.
       ref={ref}
     >
-      Connect&nbsp;<span>Wallet</span>
+      Connect <span>Wallet</span>
     </button>
   )
 })
diff --git a/src/components/Header/Wallet/Network.module.css b/src/components/Header/Wallet/Network.module.css
index decb67a88..3922b8966 100644
--- a/src/components/Header/Wallet/Network.module.css
+++ b/src/components/Header/Wallet/Network.module.css
@@ -3,23 +3,30 @@
   border-right: none;
   border-top-left-radius: var(--border-radius);
   border-bottom-left-radius: var(--border-radius);
-  padding: calc(var(--spacer) / 6) calc(var(--spacer) / 3);
+  padding: calc(var(--spacer) / 4) calc(var(--spacer) / 8);
   white-space: nowrap;
   margin-right: -3px;
   display: inline-flex;
   align-items: center;
 }
 
+@media screen and (min-width: 42rem) {
+  .network {
+    padding: calc(var(--spacer) / 4);
+  }
+}
+
 .name {
   font-size: var(--font-size-small);
 }
 
 .badge {
-  margin-left: calc(var(--spacer) / 8);
+  margin-left: -0.25rem;
   background-color: var(--border-color);
   color: var(--font-color-text);
+  font-size: calc(var(--font-size-mini) * 0.8);
 }
 
 .warning {
-  margin-right: calc(var(--spacer) / 4);
+  margin-right: calc(var(--spacer) / 14);
 }
diff --git a/src/components/Header/index.module.css b/src/components/Header/index.module.css
deleted file mode 100644
index 75001c2c6..000000000
--- a/src/components/Header/index.module.css
+++ /dev/null
@@ -1,2 +0,0 @@
-.header {
-}
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
index 88a9c5194..e8f5560c9 100644
--- a/src/components/Header/index.tsx
+++ b/src/components/Header/index.tsx
@@ -1,10 +1,9 @@
 import React, { ReactElement } from 'react'
 import Menu from './Menu'
-import styles from './index.module.css'
 
 export default function Header(): ReactElement {
   return (
-    <header className={styles.header}>
+    <header>
       <Menu />
     </header>
   )