From 92472129fd16924d66e9292e668fb54721fe48ce Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 19 Jun 2017 11:37:25 +0300 Subject: [PATCH 1/2] mobile menu margins and close icon paddings --- src/components/Modal/Modal.css | 4 ++-- src/components/TopbarMobileMenu/TopbarMobileMenu.css | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/Modal/Modal.css b/src/components/Modal/Modal.css index 09c455cb..055ecd81 100644 --- a/src/components/Modal/Modal.css +++ b/src/components/Modal/Modal.css @@ -39,7 +39,7 @@ width: auto; /* Sizing (touch area) */ - padding: 24px; + padding: 23px 24px; margin: 0; border: 0; @@ -66,7 +66,7 @@ .closeText { /* Font */ composes: h6Font from '../../marketplace.css'; - margin: -2.5px 0 0; + margin: 0; } .closeIcon { diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.css b/src/components/TopbarMobileMenu/TopbarMobileMenu.css index 3f0f1d70..fc6d577b 100644 --- a/src/components/TopbarMobileMenu/TopbarMobileMenu.css +++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.css @@ -23,7 +23,7 @@ .footer { flex-basis: var(--buttonHeight); flex-shrink: 0; - margin-bottom: 24px; + padding-bottom: 24px; } .avatar { @@ -48,16 +48,18 @@ .greeting { composes: h1Font from '../../marketplace.css'; - margin-top: 0; + margin-bottom: 12px; } .logoutButton { + /* Position component */ + width: initial; + margin: 4px 0 6px 0; + padding: 0; + /* Logout font is smaller and gray since the action is not recommended. */ @apply --marketplaceH3FontStyles; color: var(--matterColorAnti); - - margin-top: 0; - padding: 0; } .inbox { From 014334ada1fb14908a4dccd3e732f6cc8a4e18a2 Mon Sep 17 00:00:00 2001 From: Vesa Luusua Date: Mon, 19 Jun 2017 13:42:29 +0300 Subject: [PATCH 2/2] hero section min-height --- src/components/HeroSection/HeroSection.css | 1 + src/containers/LandingPage/LandingPage.css | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/HeroSection/HeroSection.css b/src/components/HeroSection/HeroSection.css index cdd912cb..d791ef7d 100644 --- a/src/components/HeroSection/HeroSection.css +++ b/src/components/HeroSection/HeroSection.css @@ -47,6 +47,7 @@ .mobileSearchButton { border-radius: 4px; + flex-shrink: 0; @media (--desktopViewport) { display: none; diff --git a/src/containers/LandingPage/LandingPage.css b/src/containers/LandingPage/LandingPage.css index a96a1b6e..6ccb2f67 100644 --- a/src/containers/LandingPage/LandingPage.css +++ b/src/containers/LandingPage/LandingPage.css @@ -5,11 +5,11 @@ } .hero { - height: calc(100vh - var(--topbarHeight)); + min-height: calc(100vh - var(--topbarHeight)); padding: 0 24px 98px 24px; @media (--desktopViewport) { - height: calc(100vh - var(--topbarHeightDesktop)); + min-height: calc(100vh - var(--topbarHeightDesktop)); } @media (min-width: 768px) {