diff --git a/internal_packages/onboarding/assets/icons-bg@2x.png b/internal_packages/onboarding/assets/icons-bg@2x.png new file mode 100644 index 000000000..c61c882a3 Binary files /dev/null and b/internal_packages/onboarding/assets/icons-bg@2x.png differ diff --git a/internal_packages/onboarding/assets/nylas-logo@2x.png b/internal_packages/onboarding/assets/nylas-logo@2x.png new file mode 100644 index 000000000..943e65f19 Binary files /dev/null and b/internal_packages/onboarding/assets/nylas-logo@2x.png differ diff --git a/internal_packages/onboarding/assets/nylas-pictographB@2x.png b/internal_packages/onboarding/assets/nylas-pictographB@2x.png deleted file mode 100644 index 6b9c73b61..000000000 Binary files a/internal_packages/onboarding/assets/nylas-pictographB@2x.png and /dev/null differ diff --git a/internal_packages/onboarding/assets/shapes-left@2x.png b/internal_packages/onboarding/assets/shapes-left@2x.png deleted file mode 100644 index 2b9701631..000000000 Binary files a/internal_packages/onboarding/assets/shapes-left@2x.png and /dev/null differ diff --git a/internal_packages/onboarding/assets/shapes-right@2x.png b/internal_packages/onboarding/assets/shapes-right@2x.png deleted file mode 100644 index a7cc1deac..000000000 Binary files a/internal_packages/onboarding/assets/shapes-right@2x.png and /dev/null differ diff --git a/internal_packages/onboarding/lib/welcome-page.cjsx b/internal_packages/onboarding/lib/welcome-page.cjsx index bc214fbdc..d4cec8273 100644 --- a/internal_packages/onboarding/lib/welcome-page.cjsx +++ b/internal_packages/onboarding/lib/welcome-page.cjsx @@ -20,14 +20,18 @@ class WelcomePage extends React.Component
{@_renderSteps()}
-
{@_renderButtons()}
+
{@_renderButtons()}
_renderButtons: -> buttons = [] - # if @state.step > 0 - # buttons.push Back - btnText = if @state.step is 2 then "Get Started" else "Continue" + btnText = "" + if @state.step is 0 + btnText = "Let’s get started" + else if @state.step is 1 + btnText = "Continue" + else if @state.step is 2 + btnText = "Get started" buttons.push return buttons @@ -47,16 +51,9 @@ class WelcomePage extends React.Component _renderStep0: ->
- -

Say hello to N1.

-

The next-generation email platform.

-
- Built with - - by Nylas -
- - + +

Welcome to Nylas N1

+ {@_renderNavBubble(0)}
diff --git a/internal_packages/onboarding/stylesheets/onboarding.less b/internal_packages/onboarding/stylesheets/onboarding.less index 4d7136312..5774923b5 100644 --- a/internal_packages/onboarding/stylesheets/onboarding.less +++ b/internal_packages/onboarding/stylesheets/onboarding.less @@ -469,7 +469,7 @@ .welcome-page { width: 675px; - height: 480px; + height: 470px; display: flex; flex-direction: column; @@ -501,6 +501,7 @@ .step-wrap { position: absolute; + overflow: hidden; top: 0; left: 0; right: 0; @@ -520,6 +521,12 @@ background: #ececec; border-top: 1px solid #d4d4d4; + &.step-0 { + border-top: 1px solid rgba(0,0,0,0.15); + box-shadow: 0 1px 1px solid rgba(255,255,255,0.25); + background-image: linear-gradient(to right, rgba(167,214,134,1) 0%,rgba(122,201,201,1) 100%); + } + .btn-continue { font-size: 17px; font-weight: 300; @@ -561,7 +568,7 @@ } .nylas-static-wash-bg { - background-image: linear-gradient(to right, rgba(162,210,128,1) 0%,rgba(113,193,154,1) 50%,rgba(89,187,187,1) 100%); + background-image: linear-gradient(to right, rgba(149,205,107,1) 0%,rgba(60,176,176,1) 100%); color: white; }