diff --git a/src/components/Button/Button.css b/src/components/Button/Button.css
index 9a1900cf..892a8283 100644
--- a/src/components/Button/Button.css
+++ b/src/components/Button/Button.css
@@ -75,7 +75,6 @@
.inlineButton {
display: inline-block;
- padding: 0;
/* fill colors should be in sync with marketplace color palette */
background-color: transparent;
diff --git a/src/components/TopbarDesktop/__snapshots__/TopbarDesktop.test.js.snap b/src/components/TopbarDesktop/__snapshots__/TopbarDesktop.test.js.snap
index 47a0c362..5d742707 100644
--- a/src/components/TopbarDesktop/__snapshots__/TopbarDesktop.test.js.snap
+++ b/src/components/TopbarDesktop/__snapshots__/TopbarDesktop.test.js.snap
@@ -55,6 +55,7 @@ exports[`TopbarDesktop data matches snapshot 1`] = `
className=""
title="">
+
diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.css b/src/components/TopbarMobileMenu/TopbarMobileMenu.css
index 31019dc0..e36ba77c 100644
--- a/src/components/TopbarMobileMenu/TopbarMobileMenu.css
+++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.css
@@ -4,24 +4,24 @@
display: flex;
flex-direction: column;
height: 100vh;
- padding: 1rem;
-}
-
-.user {
- display: flex;
- flex-direction: row;
- flex-basis: 80px;
+ padding: 24px;
}
.content {
flex-grow: 1;
+ flex-shrink: 0;
+ display: flex;
+ flex-direction: column;
+ margin: 24px 0;
}
.footer {
- flex-basis: 80px;
+ flex-basis: 66px;
+ flex-shrink: 0;
}
.avatar {
+ flex-shrink: 0;
width: 120px;
height: 120px;
border-radius: 50%;
@@ -39,26 +39,71 @@
composes: h2Font from '../../marketplace.css';
}
+.greeting {
+ composes: h2Font from '../../marketplace.css';
+}
+
+.logoutButton {
+ composes: h4Font from '../../marketplace.css';
+ text-align: left;
+ color: var(--matterColorAnti);
+ margin-top: 6px;
+}
+.inbox {
+ composes: h2Font from '../../marketplace.css';
+ color: var(--marketplaceColor);
+ margin-top: auto;
+}
+
+/* TODO createNewListingLink camouflages as a button. */
.createNewListingLink {
- font-size: 14px;
+ display: block;
+ padding: 21px;
+ background-color: var(--marketplaceColor);
+ border-width: 0;
+ border-radius: var(--borderRadius);
+
+ /* Font */
+ composes: buttonFont from '../../marketplace.css';
+ color: var(--matterColorLight);
+ text-align: center;
+
+ /* Dimensions */
+ width: 100%;
+
+ /* Hovers */
+
+ &:enabled {
+ cursor: pointer;
+ }
+ &:enabled:hover {
+ background-color: var(--marketplaceColorDark);
+ text-decoration: none;
+ }
+ &:enabled:active {
+ background-color: var(--marketplaceColorLight);
+ }
+ &:disabled {
+ background-color: var(--matterColorAnti);
+ cursor: auto;
+ }
}
-.userInfo {
- display: flex;
- flex-direction: column;
+.authenticationGreeting {
+ composes: h2Font from '../../marketplace.css';
+ margin-bottom: 24px;
}
-
.authenticationLinks {
- display: flex;
- flex-direction: row;
- margin-bottom: 1rem;
- font-size: 20px;
+ white-space: nowrap;
}
.signupLink {
- margin-right: 1rem;
text-decoration: none;
+ white-space: nowrap;
+ color: var(--marketplaceColor);
}
.loginLink {
text-decoration: none;
+ white-space: nowrap;
+ color: var(--marketplaceColor);
}
diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.js b/src/components/TopbarMobileMenu/TopbarMobileMenu.js
index 5be2bb63..f6ef1b51 100644
--- a/src/components/TopbarMobileMenu/TopbarMobileMenu.js
+++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.js
@@ -12,18 +12,35 @@ const TopbarMobileMenu = props => {
const { isAuthenticated, currentUserHasListings, firstName, lastName, onLogout } = props;
if (!isAuthenticated) {
+ const signup = (
+