updated signin dialog

This commit is contained in:
Danny Coates 2019-03-01 12:56:10 -08:00
parent 1b9182aac7
commit 4820f175dd
No known key found for this signature in database
GPG Key ID: 4C442633C62E00CB
5 changed files with 55 additions and 38 deletions

View File

@ -5,7 +5,7 @@ module.exports = function(name, url) {
return function(state, emit, close) { return function(state, emit, close) {
return html` return html`
<send-copy-dialog <send-copy-dialog
class="flex flex-col items-center text-center p-4 max-w-sm" class="flex flex-col items-center text-center p-4 max-w-sm m-auto"
> >
<h1 class="font-bold my-4"> <h1 class="font-bold my-4">
${state.translate('notifyUploadEncryptDone')} ${state.translate('notifyUploadEncryptDone')}

View File

@ -3,11 +3,13 @@ const html = require('choo/html');
module.exports = function(state, emit) { module.exports = function(state, emit) {
return html` return html`
<send-modal <send-modal
class="absolute pin flex items-center justify-center overflow-hidden z-40 bg-white md:my-8" class="absolute pin flex items-center justify-center overflow-hidden z-40 bg-white md:rounded-lg md:my-8"
onclick="${close}" onclick="${close}"
> >
<div class="h-full max-h-screen absolute pin-t flex items-center"> <div
<div class="" onclick="${e => e.stopPropagation()}"> class="h-full w-full max-h-screen absolute pin-t flex items-center justify-center"
>
<div class="w-full" onclick="${e => e.stopPropagation()}">
${state.modal(state, emit, close)} ${state.modal(state, emit, close)}
</div> </div>
</div> </div>

View File

@ -3,8 +3,8 @@ const html = require('choo/html');
module.exports = function(message) { module.exports = function(message) {
return function(state, emit, close) { return function(state, emit, close) {
return html` return html`
<send-ok-dialog class="flex flex-col max-w-xs p-4"> <send-ok-dialog class="flex flex-col max-w-sm p-4 m-auto">
<div class="text-center m-8 leading-normal">${message}</div> <h2 class="text-center m-8 leading-normal">${message}</h2>
<button <button
class="btn rounded-lg w-full flex-no-shrink" class="btn rounded-lg w-full flex-no-shrink"
onclick="${close}" onclick="${close}"

View File

@ -1,4 +1,5 @@
const html = require('choo/html'); const html = require('choo/html');
const assets = require('../../common/assets');
const { bytes, platform } = require('../utils'); const { bytes, platform } = require('../utils');
const { canceledSignup, submittedSignup } = require('../metrics'); const { canceledSignup, submittedSignup } = require('../metrics');
@ -8,37 +9,51 @@ module.exports = function(trigger) {
const hidden = platform() === 'android' ? 'hidden' : ''; const hidden = platform() === 'android' ? 'hidden' : '';
let submitting = false; let submitting = false;
return html` return html`
<send-signup-dialog class="flex flex-col p-4"> <send-signup-dialog
<h2 class="font-bold">${state.translate('accountBenefitTitle')}</h3> class="flex flex-col md:flex-row justify-center px-8 md:px-24 w-full h-full"
<ul class="my-2 leading-normal list-reset text-lg mb-8 mt-4"> >
<li>${state.translate('accountBenefitLargeFiles', { <img src="${assets.get('firefox_logo-only.svg')}" class="h-16 mb-4" />
size: bytes(state.LIMITS.MAX_FILE_SIZE) <section class="flex flex-col flex-no-shrink self-center mx-6 max-w-xs">
})}</li> <h1 class="font-bold">${state.translate('accountBenefitTitle')}</h1>
<li>${state.translate('accountBenefitExpiry')}</li> <ul class="leading-normal text-grey-darkest my-2 mb-8 mt-4 pl-4">
<li>${state.translate('accountBenefitExpiryTwo', { count: DAYS })}</li> <li>
<li>${state.translate('accountBenefitSync')}</li> ${state.translate('accountBenefitLargeFiles', {
</ul> size: bytes(state.LIMITS.MAX_FILE_SIZE)
<form })}
onsubmit=${submitEmail} </li>
data-no-csrf> <li>${state.translate('accountBenefitExpiry')}</li>
<input <li>
id="email-input" ${state.translate('accountBenefitExpiryTwo', { count: DAYS })}
type="text" </li>
class="${hidden} border rounded-lg w-full px-2 py-1 h-12 mb-4 text-lg text-grey-darker leading-loose" <li>${state.translate('accountBenefitSync')}</li>
placeholder=${state.translate('emailEntryPlaceholder')} /> </ul>
<input </section>
class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center" <section class="flex flex-col flex-grow m-4">
value="${state.translate('signInMenuOption')}" <form onsubmit=${submitEmail} data-no-csrf>
title="${state.translate('signInMenuOption')}" <input
id="email-submit" id="email-input"
type="submit" /> type="text"
</form> class="${hidden} border rounded-lg w-full px-2 py-1 h-12 mb-3 text-lg text-grey-darker leading-loose"
<button placeholder=${state.translate('emailEntryPlaceholder')}
class="my-4 text-blue-dark hover:text-blue-darker focus:text-blue-darker font-medium" />
title="${state.translate('deletePopupCancel')}" <input
onclick=${cancel}>${state.translate('deletePopupCancel')} class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center"
</button> value="${state.translate('signInMenuOption')}"
</send-signup-dialog>`; title="${state.translate('signInMenuOption')}"
id="email-submit"
type="submit"
/>
</form>
<button
class="my-3 text-blue-dark hover:text-blue-darker focus:text-blue-darker font-medium"
title="${state.translate('deletePopupCancel')}"
onclick=${cancel}
>
${state.translate('deletePopupCancel')}
</button>
</section>
</send-signup-dialog>
`;
function emailish(str) { function emailish(str) {
if (!str) { if (!str) {

View File

@ -169,7 +169,7 @@ signInContinueButton = Continue
signInMenuOption = Sign in/up signInMenuOption = Sign in/up
signInNextOption = Continue signInNextOption = Continue
accountMenuOption = Firefox Account accountMenuOption = Firefox Account
accountBenefitTitle = Create a Firefox Account or sign in to: accountBenefitTitle = Create a Firefox Account or sign in
accountBenefitLargeFiles = Share files up to { $size } accountBenefitLargeFiles = Share files up to { $size }
accountBenefitExpiry = Share files with more people accountBenefitExpiry = Share files with more people
accountBenefitExpiryTwo = { $count -> accountBenefitExpiryTwo = { $count ->