Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-21 15:56:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

💄(onboarding): Minor style changes to account choose page

Browse source
This commit is contained in:
Ben Gotow 2016-03-09 11:40:51 -08:00
parent aac3198971
commit 9c07a1a15e
6 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
internal_packages/onboarding/assets/nylas-mailplane@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 33 KiB

4
internal_packages/onboarding/lib/account-choose-page.cjsx
View file

@ -30,9 +30,7 @@ class AccountChoosePage extends React.Component
<RetinaImg name="onboarding-close.png" mode={RetinaImg.Mode.ContentPreserve}/>
</div>
<RetinaImg url="nylas://onboarding/assets/nylas-mailplane@2x.png" mode={RetinaImg.Mode.ContentPreserve} className="logo"/>
<div className="caption" style={marginTop: 25, marginBottom:20}>Select your email provider</div>
<div className="caption" style={marginTop: 33, marginBottom:25}>Select your email provider:</div>
{@_renderProviders()}

7
internal_packages/onboarding/lib/page-router-store.coffee
View file

@ -87,7 +87,12 @@ class PageRouterStore extends NylasStore
@_tokenAuthEnabled = "yes"
else
@_tokenAuthEnabled = "no"
@trigger()
if @_tokenAuthEnabled is "no" and @_page is 'token-auth'
@_onMoveToPage("account-choose")
else
@trigger()
error: (err) =>
if err.statusCode is 404
err.message = "Sorry, we could not reach the Nylas API. Please try again."

2
internal_packages/onboarding/lib/page-router.cjsx
View file

@ -68,7 +68,7 @@ class PageRouter extends React.Component
background = "linear-gradient(to top, #f6f7f8, #{gradient})"
height = 200
else
background = "linear-gradient(to top, #f6f7f8 0%, rgba(255,255,255,0) 100%), linear-gradient(to right, #e1e58f 0%, #a8d29e 50%, #8bc9c9 100%)"
background = "linear-gradient(to top, #f6f7f8 0%, rgba(255,255,255,0) 100%), linear-gradient(to right, #E7EBAE 0%, #C1DFBC 50%, #AED7D7 100%)"
height = 330
<div className="page-gradient" key={"#{@state.page}-gradient"} style={background: background, height: height}/>

3
internal_packages/onboarding/lib/token-auth-api.coffee
View file

@ -33,12 +33,9 @@ class TokenAuthAPI
request: options,
requestId: requestId
})
console.log options
nodeRequest options, (error, response, body) ->
statusCode = response?.statusCode
console.log error, response, body
Actions.didMakeAPIRequest({
request: options,
statusCode: statusCode,

24
internal_packages/onboarding/stylesheets/onboarding.less
View file

@ -117,9 +117,6 @@
.page {
margin:auto;
&.account-choose {
padding-top: 45px;
}
&.account-setup {
padding: 0 15px;
width: 330px
@ -313,16 +310,16 @@
}
.page.account-choose {
width: 388px;
height: 688px;
width: 330px;
height: 478px;
.caption {
font-size: 17px;
font-size: 19px;
color: rgba(0,0,0,0.56);
}
.provider-name {
font-size: 20px;
font-size: 18px;
font-weight: 300;
color: rgba(0,0,0,0.7);
}
@ -331,19 +328,20 @@
text-align: left;
border-top: 1px solid rgba(0,0,0,0.05);
cursor: default;
line-height: 70px;
line-height: 63px;
.icon-container {
width: 50px;
height: 50px;
display: inline-block;
box-sizing: content-box;
padding: 0 25px 0 25px;
padding: 0 15px 0 20px;
vertical-align: top;
zoom: 0.9;
}
}
.provider:hover{
background: rgba(255,255,255,0.7);
background: rgba(255,255,255,0.4);
}
}
@ -351,12 +349,12 @@
height: auto;
padding-bottom:25px;
}
.page.token-auth{
.page.token-auth {
width: 388px;
min-height: 500px;
min-height: 478px;
position: relative;
padding-top: 50px;
padding-top: 40px;
img.logo.content-mask {
background-color: rgba(255,255,255,0.4);
}