From 6fbe78eb34065137468be8d515982a8f11dc353b Mon Sep 17 00:00:00 2001 From: Leonard Kim Date: Thu, 22 Feb 2018 15:08:17 -0800 Subject: [PATCH] fix(welcome-page): change font family and spacing --- css/_variables.scss | 1 + css/_welcome_page.scss | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/css/_variables.scss b/css/_variables.scss index 7cf194a04..72b988c8e 100644 --- a/css/_variables.scss +++ b/css/_variables.scss @@ -157,5 +157,6 @@ $watermarkHeight: 74px; * Welcome page variables. */ $welcomePageDescriptionColor: #fff; +$welcomePageFontFamily: inherit; $welcomePageHeaderBackground: linear-gradient(#165ecc, #44A5FF); $welcomePageTitleColor: #fff; diff --git a/css/_welcome_page.scss b/css/_welcome_page.scss index fc22d7c82..6b635e5ae 100644 --- a/css/_welcome_page.scss +++ b/css/_welcome_page.scss @@ -1,5 +1,5 @@ .welcome { - font-family: Helvetica; + font-family: $welcomePageFontFamily; height: 100%; overflow: auto; position: relative; @@ -16,9 +16,10 @@ .header-text { display: flex; flex-direction: column; - height: 286px; justify-content: space-around; margin-top: 120px; + margin-bottom: 20px; + min-height: 286px; width: 645px; } @@ -27,6 +28,7 @@ font-size: 48px; letter-spacing: -1px; line-height: 58px; + margin-bottom: 20px; } .header-text-description { @@ -47,7 +49,7 @@ #new_enter_room { align-items: center; display: flex; - margin-top: 25px; + margin-bottom: 20px; position: relative; z-index: 2; @@ -66,7 +68,7 @@ .welcome.with-content { .header { - height: 552px; + min-height: 552px; } .header-image { left: -61px;