From 241a1efff3f2513367c0f299751c4f0c9c5836ae Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Tue, 6 Jun 2017 14:19:33 +0300 Subject: [PATCH] Font names and styles were changed in previous commit. --- src/components/Modal/Modal.css | 2 +- src/components/TopbarDesktop/TopbarDesktop.css | 10 +++++----- src/components/TopbarMobileMenu/TopbarMobileMenu.css | 11 ++++++----- src/marketplace.css | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/components/Modal/Modal.css b/src/components/Modal/Modal.css index e0abd2a7..aea8de65 100644 --- a/src/components/Modal/Modal.css +++ b/src/components/Modal/Modal.css @@ -47,7 +47,7 @@ padding: 24px; color: var(--matterColor); border: 0; - composes: tinyBoldFont from '../../marketplace.css'; + composes: h6Font from '../../marketplace.css'; &:enabled:hover { background-color: transparent; diff --git a/src/components/TopbarDesktop/TopbarDesktop.css b/src/components/TopbarDesktop/TopbarDesktop.css index cfacbc58..321e1c70 100644 --- a/src/components/TopbarDesktop/TopbarDesktop.css +++ b/src/components/TopbarDesktop/TopbarDesktop.css @@ -53,7 +53,7 @@ .search { composes: topbarDesktopLabel; - composes: bodyFont from '../../marketplace.css'; + composes: h4Font from '../../marketplace.css'; color: var(--matterColor); } @@ -66,7 +66,7 @@ .createListing { composes: topbarDesktopLabel; - composes: bodyFont from '../../marketplace.css'; + composes: h4Font from '../../marketplace.css'; color: var(--marketplaceColor); } @@ -78,7 +78,7 @@ .inbox { composes: topbarDesktopLabel; - composes: bodyFont from '../../marketplace.css'; + composes: h4Font from '../../marketplace.css'; color: var(--matterColor); } @@ -114,14 +114,14 @@ .signup, .login { composes: topbarDesktopLabel; - composes: bodyFont from '../../marketplace.css'; + composes: h4Font from '../../marketplace.css'; color: var(--matterColor); } .logoutButton { width: 100%; padding: 20px 24px; - composes: bodyFont from '../../marketplace.css'; + composes: h4Font from '../../marketplace.css'; text-align: left; white-space: nowrap; diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.css b/src/components/TopbarMobileMenu/TopbarMobileMenu.css index e36ba77c..0a8c7963 100644 --- a/src/components/TopbarMobileMenu/TopbarMobileMenu.css +++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.css @@ -36,21 +36,22 @@ color: var(--matterColorLight); /* Font */ - composes: h2Font from '../../marketplace.css'; + composes: h1Font from '../../marketplace.css'; } .greeting { - composes: h2Font from '../../marketplace.css'; + composes: h1Font from '../../marketplace.css'; } .logoutButton { - composes: h4Font from '../../marketplace.css'; + composes: h3Font from '../../marketplace.css'; text-align: left; color: var(--matterColorAnti); margin-top: 6px; } + .inbox { - composes: h2Font from '../../marketplace.css'; + composes: h1Font from '../../marketplace.css'; color: var(--marketplaceColor); margin-top: auto; } @@ -90,7 +91,7 @@ } .authenticationGreeting { - composes: h2Font from '../../marketplace.css'; + composes: h1Font from '../../marketplace.css'; margin-bottom: 24px; } .authenticationLinks { diff --git a/src/marketplace.css b/src/marketplace.css index be4a6607..7dd498b3 100644 --- a/src/marketplace.css +++ b/src/marketplace.css @@ -215,7 +215,7 @@ li, /* This font is specific to Avatar component only */ .smallAvatarFont { font-family: "sofiapro", Helvetica, Arial, sans-serif; - font-weight: 400; /* Regular */ + font-weight: 700; /* Bold */ font-size: 14px; line-height: 18px; padding: 7.5px 0 4.5px;